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

cli: follow git HEAD update if collocated

Browse source 
If the workspace's working copy is shared with the backing Git repo,
we now automatically update the checkout in jj to match Git's HEAD
when that has changed.

With this change, I think users should be able to run `jj init
--git-store=.` and then continue to use `git` commands and
non-mutating `jj` commands without issue.

This is part of issue #44.
This commit is contained in:
Martin von Zweigbergk 2021-12-01 10:47:10 -08:00
parent 75f0abf396
commit e587071ffe
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/commands.rs
View file

@ -232,7 +232,7 @@ struct WorkspaceCommandHelper {
impl WorkspaceCommandHelper {
fn for_loaded_repo(
ui: &Ui,
workspace: Workspace,
mut workspace: Workspace,
string_args: Vec<String>,
root_args: &ArgMatches,
mut repo: Arc<ReadonlyRepo>,
@ -243,7 +243,23 @@ impl WorkspaceCommandHelper {
let mut tx = repo.start_transaction("import git refs");
git::import_refs(tx.mut_repo(), &git_repo)?;
if tx.mut_repo().has_changes() {
let old_git_head = repo.view().git_head();
let new_git_head = tx.mut_repo().view().git_head();
// If the Git HEAD has changed, abandon our old checkout and check out the new
// Git HEAD.
let mut new_wc_commit = None;
if new_git_head != old_git_head && new_git_head.is_some() {
tx.mut_repo().record_abandoned_commit(repo.view().checkout().clone());
let new_checkout = repo.store().get_commit(new_git_head.as_ref().unwrap())?;
let new_checkout = tx.mut_repo().check_out(ui.settings(), &new_checkout);
new_wc_commit = Some(new_checkout);
tx.mut_repo().create_descendant_rebaser(ui.settings()).rebase_all();
}
repo = tx.commit();
if let Some(new_wc_commit) = new_wc_commit {
let locked_working_copy = workspace.working_copy_mut().write_tree();
locked_working_copy.finish(new_wc_commit);
}
}
}
}