mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-31 16:33:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

cli: clarify a comment and some variable names

Browse source
This commit is contained in:
Martin von Zweigbergk 2022-01-19 14:59:50 -08:00
parent dd81e4a3a1
commit cb5dd387ed
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/commands.rs
View file

@ -464,26 +464,27 @@ impl WorkspaceCommandHelper {
if self.may_update_working_copy { if self.may_update_working_copy {
let repo = self.repo.clone(); let repo = self.repo.clone();
let mut locked_wc = self.workspace.working_copy_mut().start_mutation(); let mut locked_wc = self.workspace.working_copy_mut().start_mutation();
let old_commit = self let wc_commit = self
.repo .repo
.store() .store()
.get_commit(locked_wc.old_commit_id()) .get_commit(locked_wc.old_commit_id())
.unwrap(); .unwrap();
// Check if the current checkout has changed on disk after we read it. It's fine // Check if the working copy commit matches the repo's view. It's fine if it
// if it has, but we'll need to reload the repo so the new commit is // doesn't, but we'll need to reload the repo so the new commit is
// in the index and view. // in the index and view, and so we don't cause unnecessary
let old_checkout = repo.view().checkout(); // divergence.
if old_checkout != old_commit.id() { let checkout = repo.view().checkout();
if checkout != wc_commit.id() {
// TODO: This is not enough. The new commit is not necessarily still in the // TODO: This is not enough. The new commit is not necessarily still in the
// view when we reload. // view when we reload.
self.repo = repo.reload(); self.repo = repo.reload();
} }
let new_tree_id = locked_wc.write_tree(); let new_tree_id = locked_wc.write_tree();
if new_tree_id != *old_commit.tree().id() { if new_tree_id != *wc_commit.tree().id() {
let mut tx = self.repo.start_transaction("commit working copy"); let mut tx = self.repo.start_transaction("commit working copy");
let mut_repo = tx.mut_repo(); let mut_repo = tx.mut_repo();
let commit = let commit =
CommitBuilder::for_rewrite_from(&self.settings, self.repo.store(), &old_commit) CommitBuilder::for_rewrite_from(&self.settings, self.repo.store(), &wc_commit)
.set_tree(new_tree_id) .set_tree(new_tree_id)
.write_to_repo(mut_repo); .write_to_repo(mut_repo);
mut_repo.set_checkout(commit.id().clone()); mut_repo.set_checkout(commit.id().clone());