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

cli: bookmark list: simply apply --remote filter to source remote_refs

Browse source
This commit is contained in:
Yuya Nishihara 2024-10-25 18:14:39 +09:00
parent d40e06395e
commit 63785a24da
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cli/src/commands/bookmark/list.rs
View file

@ -147,18 +147,16 @@ pub fn cmd_bookmark_list(
for (name, bookmark_target) in bookmarks_to_list { for (name, bookmark_target) in bookmarks_to_list {
let local_target = bookmark_target.local_target; let local_target = bookmark_target.local_target;
let remote_refs = bookmark_target.remote_refs; let remote_refs = bookmark_target.remote_refs;
let (mut tracking_remote_refs, mut untracked_remote_refs) = remote_refs let (mut tracking_remote_refs, untracked_remote_refs) = remote_refs
.iter() .iter()
.copied() .copied()
.filter(|&(remote_name, _)| {
args.remotes
.as_ref()
.map_or(true, |names| names.iter().any(|r| r == remote_name))
})
.partition::<Vec<_>, _>(|&(_, remote_ref)| remote_ref.is_tracking()); .partition::<Vec<_>, _>(|&(_, remote_ref)| remote_ref.is_tracking());
if let Some(names) = &args.remotes {
let filter = |refs: &mut Vec<_>| {
refs.retain(|&(remote_name, _)| names.iter().any(|r| r == remote_name));
};
filter(&mut tracking_remote_refs);
filter(&mut untracked_remote_refs);
}
if args.tracked { if args.tracked {
tracking_remote_refs tracking_remote_refs
.retain(|&(remote, _)| remote != git::REMOTE_NAME_FOR_LOCAL_GIT_REPO); .retain(|&(remote, _)| remote != git::REMOTE_NAME_FOR_LOCAL_GIT_REPO);