mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 10:07:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

working_copy: stop taking commit ID in LockedWorkingCopy::finish()

Browse source 
We used to use the value to detect races, but we use the tree ID and
the operation ID these days, so we don't need the commit ID.

By changing this, we can avoid creating some commit IDs in tests,
which is why I tackled this issue now.
This commit is contained in:
Martin von Zweigbergk 2022-02-12 23:28:59 -08:00
parent cde3609163
commit 00c9a1ae11
3 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/src/working_copy.rs
View file

@ -32,7 +32,7 @@ use tempfile::NamedTempFile;
use thiserror::Error;
use crate::backend::{
BackendError, CommitId, ConflictId, FileId, MillisSinceEpoch, SymlinkId, TreeId, TreeValue,
BackendError, ConflictId, FileId, MillisSinceEpoch, SymlinkId, TreeId, TreeValue,
};
use crate::commit::Commit;
use crate::conflicts::{materialize_conflict, update_conflict_from_content};
@ -874,9 +874,8 @@ impl WorkingCopy {
return Err(CheckoutError::ConcurrentCheckout);
}
}
let new_commit_id = new_commit.id().clone();
let stats = locked_wc.check_out(new_commit.tree_id().clone())?;
locked_wc.finish(operation_id, new_commit_id);
locked_wc.finish(operation_id);
Ok(stats)
}
}
@ -923,7 +922,7 @@ impl LockedWorkingCopy<'_> {
self.wc.tree_state().as_mut().unwrap().reset(new_tree)
}
pub fn finish(mut self, operation_id: OperationId, _commit_id: CommitId) {
pub fn finish(mut self, operation_id: OperationId) {
self.wc.tree_state().as_mut().unwrap().save();
self.wc.operation_id.replace(Some(operation_id));
self.wc.save();

22
lib/tests/test_working_copy.rs
View file

@ -312,13 +312,6 @@ fn test_reset() {
let mut tx = repo.start_transaction("test");
let store = repo.store();
let root_commit = store.root_commit_id();
let commit_without_file = CommitBuilder::for_open_commit(
&settings,
store,
root_commit.clone(),
tree_without_file.id().clone(),
)
.write_to_repo(tx.mut_repo());
let commit_with_file = CommitBuilder::for_open_commit(
&settings,
store,
@ -330,7 +323,7 @@ fn test_reset() {
test_workspace.repo = repo.clone();
let wc = test_workspace.workspace.working_copy_mut();
wc.check_out(repo.op_id().clone(), None, commit_with_file.clone())
wc.check_out(repo.op_id().clone(), None, commit_with_file)
.unwrap();
// Test the setup: the file should exist on disk and in the tree state.
@ -342,7 +335,7 @@ fn test_reset() {
// commit the working copy (because it's ignored).
let mut locked_wc = wc.start_mutation();
locked_wc.reset(&tree_without_file).unwrap();
locked_wc.finish(repo.op_id().clone(), commit_without_file.id().clone());
locked_wc.finish(repo.op_id().clone());
assert!(ignored_path.to_fs_path(&workspace_root).is_file());
assert!(!wc.file_states().contains_key(&ignored_path));
let mut locked_wc = wc.start_mutation();
@ -355,7 +348,7 @@ fn test_reset() {
// commit the working copy (because it's ignored).
let mut locked_wc = wc.start_mutation();
locked_wc.reset(&tree_without_file).unwrap();
locked_wc.finish(repo.op_id().clone(), commit_without_file.id().clone());
locked_wc.finish(repo.op_id().clone());
assert!(ignored_path.to_fs_path(&workspace_root).is_file());
assert!(!wc.file_states().contains_key(&ignored_path));
let mut locked_wc = wc.start_mutation();
@ -367,7 +360,7 @@ fn test_reset() {
// tracked. The file should become tracked (even though it's ignored).
let mut locked_wc = wc.start_mutation();
locked_wc.reset(&tree_with_file).unwrap();
locked_wc.finish(repo.op_id().clone(), commit_with_file.id().clone());
locked_wc.finish(repo.op_id().clone());
assert!(ignored_path.to_fs_path(&workspace_root).is_file());
assert!(wc.file_states().contains_key(&ignored_path));
let mut locked_wc = wc.start_mutation();
@ -487,12 +480,7 @@ fn test_gitignores(use_git: bool) {
let wc = test_workspace.workspace.working_copy_mut();
let mut locked_wc = wc.start_mutation();
let new_tree_id1 = locked_wc.write_tree();
let mut tx = repo.start_transaction("test");
let initial_commit =
CommitBuilder::for_new_commit(&settings, repo.store(), new_tree_id1.clone())
.write_to_repo(tx.mut_repo());
let repo = tx.commit();
locked_wc.finish(repo.op_id().clone(), initial_commit.id().clone());
locked_wc.finish(repo.op_id().clone());
let tree1 = repo
.store()
.get_tree(&RepoPath::root(), &new_tree_id1)

13
src/commands.rs
View file

@ -299,16 +299,15 @@ impl WorkspaceCommandHelper {
.repo
.store()
.get_commit(new_git_head.as_ref().unwrap())?;
let new_wc_commit =
tx.mut_repo()
.check_out(workspace_id, &self.settings, &new_checkout);
tx.mut_repo()
.check_out(workspace_id, &self.settings, &new_checkout);
// The working copy was presumably updated by the git command that updated HEAD,
// so we just need to reset our working copy state to it without updating
// working copy files.
locked_working_copy.reset(&new_checkout.tree())?;
tx.mut_repo().rebase_descendants(&self.settings);
self.repo = tx.commit();
locked_working_copy.finish(self.repo.op_id().clone(), new_wc_commit.id().clone());
locked_working_copy.finish(self.repo.op_id().clone());
} else {
self.repo = tx.commit();
}
@ -580,7 +579,7 @@ impl WorkspaceCommandHelper {
}
self.repo = tx.commit();
locked_wc.finish(self.repo.op_id().clone(), commit.id().clone());
locked_wc.finish(self.repo.op_id().clone());
} else {
locked_wc.discard();
}
@ -1801,7 +1800,7 @@ fn cmd_untrack(
locked_working_copy.reset(&new_tree)?;
}
}
let new_commit = CommitBuilder::for_rewrite_from(ui.settings(), &store, &current_checkout)
CommitBuilder::for_rewrite_from(ui.settings(), &store, &current_checkout)
.set_tree(new_tree_id)
.write_to_repo(tx.mut_repo());
let num_rebased = tx.mut_repo().rebase_descendants(ui.settings());
@ -1809,7 +1808,7 @@ fn cmd_untrack(
writeln!(ui, "Rebased {} descendant commits", num_rebased)?;
}
let repo = tx.commit();
locked_working_copy.finish(repo.op_id().clone(), new_commit.id().clone());
locked_working_copy.finish(repo.op_id().clone());
Ok(())
}