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

cli: reduce scope of a variable in jj git push

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-08-21 16:07:20 -07:00 committed by Martin von Zweigbergk
parent 702d277284
commit d9bd578662
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cli/src/commands/git.rs
View file

@ -668,13 +668,6 @@ fn cmd_git_push(
.iter()
.map(|change_str| workspace_command.resolve_single_rev(change_str, ui))
.try_collect()?;
// TODO: Narrow search space to local target commits.
// TODO: Remove redundant CommitId -> Commit -> CommitId round trip.
let revision_commit_ids: HashSet<_> =
resolve_multiple_nonempty_revsets(&args.revisions, &workspace_command, ui)?
.iter()
.map(|commit| commit.id().clone())
.collect();
fn find_branches_targeting<'a>(
view: &'a View,
@ -778,6 +771,13 @@ fn cmd_git_push(
}
}
// TODO: Narrow search space to local target commits.
// TODO: Remove redundant CommitId -> Commit -> CommitId round trip.
let revision_commit_ids: HashSet<_> =
resolve_multiple_nonempty_revsets(&args.revisions, tx.base_workspace_helper(), ui)?
.iter()
.map(|commit| commit.id().clone())
.collect();
let branches_targeted =
find_branches_targeting(repo.view(), |id| revision_commit_ids.contains(id));
for &(branch_name, branch_target) in &branches_targeted {