martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-21 18:58:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

cli: on clone, split fetch transaction from checkout transaction

Browse Source 
Fetching is typically much expensive than checking out, so if fetching
completes but checking out fails (due to some bug, perhaps), it seems
better to commit the fetch transaction. That way, the user can inspect
the repo and try checking out again.
This commit is contained in:
Martin von Zweigbergk 2022-06-30 10:36:27 -07:00 committed by Martin von Zweigbergk
parent a2b4bd239f
commit 485dcb2779
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/commands.rs
View File

@ -5009,9 +5009,9 @@ fn cmd_git_clone(
let mut workspace_command = command.for_loaded_repo(ui, workspace, repo)?;
let remote_name = "origin";
git_repo.remote(remote_name, source).unwrap();
let mut tx = workspace_command.start_transaction("fetch from git remote into empty repo");
let mut fetch_tx = workspace_command.start_transaction("fetch from git remote into empty repo");
let maybe_default_branch =
git::fetch(tx.mut_repo(), &git_repo, remote_name).map_err(|err| match err {
git::fetch(fetch_tx.mut_repo(), &git_repo, remote_name).map_err(|err| match err {
GitFetchError::NoSuchRemote(_) => {
panic!("should't happen as we just created the git remote")
}
@ -5019,19 +5019,22 @@ fn cmd_git_clone(
CommandError::UserError(format!("Fetch failed: {err}"))
}
})?;
workspace_command.finish_transaction(ui, fetch_tx)?;
if let Some(default_branch) = maybe_default_branch {
let default_branch_target = tx
.mut_repo()
let default_branch_target = workspace_command
.repo()
.view()
.get_remote_branch(&default_branch, "origin");
if let Some(RefTarget::Normal(commit_id)) = default_branch_target {
let mut checkout_tx =
workspace_command.start_transaction("check out git remote's default branch");
if let Ok(commit) = workspace_command.repo().store().get_commit(&commit_id) {
tx.mut_repo()
checkout_tx.mut_repo()
.check_out(workspace_command.workspace_id(), ui.settings(), &commit);
}
workspace_command.finish_transaction(ui, checkout_tx)?;
}
}
workspace_command.finish_transaction(ui, tx)?;
Ok(())
}