ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: extract a function for finding single-branch push update

Browse source 
This will be reused in the next commit.
This commit is contained in:
Martin von Zweigbergk 2022-04-28 20:58:41 -07:00 committed by Martin von Zweigbergk
parent 6e30bd76f9
commit bc75b08f4b
1 changed files with 48 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
src/commands.rs
View file

@ -46,7 +46,7 @@ use jujutsu_lib::matchers::{EverythingMatcher, Matcher, PrefixMatcher, Visit};
use jujutsu_lib::op_heads_store::{OpHeadResolutionError, OpHeads, OpHeadsStore}; use jujutsu_lib::op_heads_store::{OpHeadResolutionError, OpHeads, OpHeadsStore};
use jujutsu_lib::op_store::{OpStore, OpStoreError, OperationId, RefTarget, WorkspaceId}; use jujutsu_lib::op_store::{OpStore, OpStoreError, OperationId, RefTarget, WorkspaceId};
use jujutsu_lib::operation::Operation; use jujutsu_lib::operation::Operation;
use jujutsu_lib::refs::{classify_branch_push_action, BranchPushAction}; use jujutsu_lib::refs::{classify_branch_push_action, BranchPushAction, BranchPushUpdate};
use jujutsu_lib::repo::{MutableRepo, ReadonlyRepo, RepoRef}; use jujutsu_lib::repo::{MutableRepo, ReadonlyRepo, RepoRef};
use jujutsu_lib::repo_path::RepoPath; use jujutsu_lib::repo_path::RepoPath;
use jujutsu_lib::revset::{RevsetError, RevsetExpression, RevsetParseError}; use jujutsu_lib::revset::{RevsetError, RevsetExpression, RevsetParseError};
@ -4742,48 +4742,14 @@ fn cmd_git_push(
let mut branch_updates = HashMap::new(); let mut branch_updates = HashMap::new();
if let Some(branch_name) = &args.branch { if let Some(branch_name) = &args.branch {
let maybe_branch_target = repo.view().get_branch(branch_name); if let Some(update) = branch_updates_for_push(repo, &args.remote, branch_name)? {
if maybe_branch_target.is_none() { branch_updates.insert(branch_name, update);
return Err(CommandError::UserError(format!( } else {
"Branch {} doesn't exist", writeln!(
branch_name ui,
))); "Branch {}@{} already matches {}",
} branch_name, &args.remote, branch_name
let branch_target = maybe_branch_target.unwrap(); )?;
let push_action = classify_branch_push_action(branch_target, &args.remote);
match push_action {
BranchPushAction::AlreadyMatches => {
writeln!(
ui,
"Branch {}@{} already matches {}",
branch_name, &args.remote, branch_name
)?;
return Ok(());
}
BranchPushAction::LocalConflicted => {
return Err(CommandError::UserError(format!(
"Branch {} is conflicted",
branch_name
)));
}
BranchPushAction::RemoteConflicted => {
return Err(CommandError::UserError(format!(
"Branch {}@{} is conflicted",
branch_name, &args.remote
)));
}
BranchPushAction::Update(update) => {
if let Some(new_target) = &update.new_target {
let new_target_commit = repo.store().get_commit(new_target)?;
if new_target_commit.is_open() {
return Err(CommandError::UserError(
"Won't push open commit".to_string(),
));
}
}
branch_updates.insert(branch_name, update);
}
} }
} else { } else {
// TODO: Is it useful to warn about conflicted branches? // TODO: Is it useful to warn about conflicted branches?
@ -4868,6 +4834,45 @@ fn cmd_git_push(
Ok(()) Ok(())
} }
fn branch_updates_for_push(
repo: &Arc<ReadonlyRepo>,
remote_name: &str,
branch_name: &str,
) -> Result<Option<BranchPushUpdate>, CommandError> {
let maybe_branch_target = repo.view().get_branch(branch_name);
if maybe_branch_target.is_none() {
return Err(CommandError::UserError(format!(
"Branch {} doesn't exist",
branch_name
)));
}
let branch_target = maybe_branch_target.unwrap();
let push_action = classify_branch_push_action(branch_target, remote_name);
match push_action {
BranchPushAction::AlreadyMatches => Ok(None),
BranchPushAction::LocalConflicted => Err(CommandError::UserError(format!(
"Branch {} is conflicted",
branch_name
))),
BranchPushAction::RemoteConflicted => Err(CommandError::UserError(format!(
"Branch {}@{} is conflicted",
branch_name, remote_name
))),
BranchPushAction::Update(update) => {
if let Some(new_target) = &update.new_target {
let new_target_commit = repo.store().get_commit(new_target)?;
if new_target_commit.is_open() {
return Err(CommandError::UserError(
"Won't push open commit".to_string(),
));
}
}
Ok(Some(update))
}
}
}
fn cmd_git_import( fn cmd_git_import(
ui: &mut Ui, ui: &mut Ui,
command: &CommandHelper, command: &CommandHelper,