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

cli: automatically import git refs if repos are collocated

Browse source 
This change makes commands automatically import git refs if they're
run in a workspace that shares its working copy with the underlying
git repo. The import is done in a separate transaction.

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

29
src/commands.rs
View file

@ -196,7 +196,7 @@ jj init --git-store={} <path to new jj repo>",
)?; )?;
repo_loader.load_at(&op) repo_loader.load_at(&op)
}; };
Ok(self.for_loaded_repo(ui, workspace, repo)) self.for_loaded_repo(ui, workspace, repo)
} }
fn for_loaded_repo( fn for_loaded_repo(
@ -204,7 +204,7 @@ jj init --git-store={} <path to new jj repo>",
ui: &Ui, ui: &Ui,
workspace: Workspace, workspace: Workspace,
repo: Arc<ReadonlyRepo>, repo: Arc<ReadonlyRepo>,
) -> WorkspaceCommandHelper { ) -> Result<WorkspaceCommandHelper, CommandError> {
WorkspaceCommandHelper::for_loaded_repo( WorkspaceCommandHelper::for_loaded_repo(
ui, ui,
workspace, workspace,
@ -235,18 +235,27 @@ impl WorkspaceCommandHelper {
workspace: Workspace, workspace: Workspace,
string_args: Vec<String>, string_args: Vec<String>,
root_args: &ArgMatches, root_args: &ArgMatches,
repo: Arc<ReadonlyRepo>, mut repo: Arc<ReadonlyRepo>,
) -> Self { ) -> Result<Self, CommandError> {
let may_update_working_copy = root_args.value_of("at_op").unwrap() == "@"; let loaded_at_head = root_args.value_of("at_op").unwrap() == "@";
Self { if let Some(git_repo) = repo.store().git_repo() {
if git_repo.workdir() == Some(workspace.workspace_root().as_path()) && loaded_at_head {
let mut tx = repo.start_transaction("import git refs");
git::import_refs(tx.mut_repo(), &git_repo)?;
if tx.mut_repo().has_changes() {
repo = tx.commit();
}
}
}
Ok(Self {
string_args, string_args,
settings: ui.settings().clone(), settings: ui.settings().clone(),
workspace, workspace,
repo, repo,
may_update_working_copy, may_update_working_copy: loaded_at_head,
working_copy_committed: false, working_copy_committed: false,
rebase_descendants: true, rebase_descendants: true,
} })
} }
fn rebase_descendants(mut self, value: bool) -> Self { fn rebase_descendants(mut self, value: bool) -> Self {
@ -1404,7 +1413,7 @@ fn cmd_init(ui: &mut Ui, command: &CommandHelper, args: &ArgMatches) -> Result<(
let (workspace, repo) = let (workspace, repo) =
Workspace::init_external_git(ui.settings(), wc_path.clone(), git_store_path)?; Workspace::init_external_git(ui.settings(), wc_path.clone(), git_store_path)?;
let git_repo = repo.store().git_repo().unwrap(); let git_repo = repo.store().git_repo().unwrap();
let mut workspace_command = command.for_loaded_repo(ui, workspace, repo); let mut workspace_command = command.for_loaded_repo(ui, workspace, repo)?;
let mut tx = workspace_command.start_transaction("import git refs"); let mut tx = workspace_command.start_transaction("import git refs");
git::import_refs(tx.mut_repo(), &git_repo)?; git::import_refs(tx.mut_repo(), &git_repo)?;
// TODO: Check out a recent commit. Maybe one with the highest generation // TODO: Check out a recent commit. Maybe one with the highest generation
@ -3550,7 +3559,7 @@ fn cmd_git_clone(
let (workspace, repo) = Workspace::init_internal_git(ui.settings(), wc_path.clone())?; let (workspace, repo) = Workspace::init_internal_git(ui.settings(), wc_path.clone())?;
let git_repo = get_git_repo(repo.store())?; let git_repo = get_git_repo(repo.store())?;
writeln!(ui, "Fetching into new repo in {:?}", wc_path)?; writeln!(ui, "Fetching into new repo in {:?}", wc_path)?;
let mut workspace_command = command.for_loaded_repo(ui, workspace, repo); let mut workspace_command = command.for_loaded_repo(ui, workspace, repo)?;
let remote_name = "origin"; let remote_name = "origin";
git_repo.remote(remote_name, source).unwrap(); git_repo.remote(remote_name, source).unwrap();
let mut tx = workspace_command.start_transaction("fetch from git remote into empty repo"); let mut tx = workspace_command.start_transaction("fetch from git remote into empty repo");