cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-25 17:11:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

cli: check for concurrent operation during jj untrack

Browse Source 
This patch addresses the TODO about a (tiny) race that could happen if
`jj untrack` was run concurrently with another operation.
This commit is contained in:
Martin von Zweigbergk 2022-02-12 16:41:51 -08:00
parent 537b1de7d9
commit 21d277b7dc
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/commands.rs
View File

@ -1751,16 +1751,28 @@ fn cmd_untrack(
args.values_of("paths"), args.values_of("paths"),
)?; )?;
let current_checkout_id = workspace_command
.repo
.view()
.get_checkout(&workspace_command.workspace_id());
let current_checkout = if let Some(current_checkout_id) = current_checkout_id {
store.get_commit(current_checkout_id).unwrap()
} else {
return Err(CommandError::UserError(
"Nothing checked out in this workspace".to_string(),
));
};
let mut tx = workspace_command.start_transaction("untrack paths"); let mut tx = workspace_command.start_transaction("untrack paths");
let mut locked_working_copy = workspace_command.working_copy_mut().start_mutation(); let mut locked_working_copy = workspace_command.working_copy_mut().start_mutation();
// TODO: Error out if locked_working_copy.old_commit_id() doesn't match if current_checkout.id() != locked_working_copy.old_commit_id() {
// repo.view().checkout() return Err(CommandError::UserError(
let old_commit = store "Concurrent working copy operation. Try again.".to_string(),
.get_commit(locked_working_copy.old_commit_id()) ));
.unwrap(); }
// Create a new tree without the unwanted files // Create a new tree without the unwanted files
let mut tree_builder = store.tree_builder(old_commit.tree_id().clone()); let mut tree_builder = store.tree_builder(current_checkout.tree_id().clone());
for (path, _value) in old_commit.tree().entries_matching(matcher.as_ref()) { for (path, _value) in current_checkout.tree().entries_matching(matcher.as_ref()) {
tree_builder.remove(path); tree_builder.remove(path);
} }
let new_tree_id = tree_builder.write_tree(); let new_tree_id = tree_builder.write_tree();
@ -1786,7 +1798,7 @@ fn cmd_untrack(
locked_working_copy.reset(&new_tree)?; locked_working_copy.reset(&new_tree)?;
} }
} }
let new_commit = CommitBuilder::for_rewrite_from(ui.settings(), &store, &old_commit) let new_commit = CommitBuilder::for_rewrite_from(ui.settings(), &store, &current_checkout)
.set_tree(new_tree_id) .set_tree(new_tree_id)
.write_to_repo(tx.mut_repo()); .write_to_repo(tx.mut_repo());
let num_rebased = tx.mut_repo().rebase_descendants(ui.settings()); let num_rebased = tx.mut_repo().rebase_descendants(ui.settings());