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

revset: use op_store::View type to resolve branches()/remote_branches()

Browse source 
These functions depend heavily on the underlying data structure, and I haven't
decided abstract View API to access to per-remote data types. Let's use the
underlying data type for now.
This commit is contained in:
Yuya Nishihara 2023-10-07 03:04:54 +09:00
parent 0160eaefd9
commit 3ec3cac90b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/src/revset.rs
View file

@ -2190,8 +2190,8 @@ fn resolve_commit_ref(
RevsetCommitRef::VisibleHeads => Ok(repo.view().heads().iter().cloned().collect_vec()), RevsetCommitRef::VisibleHeads => Ok(repo.view().heads().iter().cloned().collect_vec()),
RevsetCommitRef::Root => Ok(vec![repo.store().root_commit_id().clone()]), RevsetCommitRef::Root => Ok(vec![repo.store().root_commit_id().clone()]),
RevsetCommitRef::Branches(pattern) => { RevsetCommitRef::Branches(pattern) => {
let view = repo.view(); let view_data = repo.view().store_view();
let commit_ids = filter_map_values_by_key_pattern(view.branches(), pattern) let commit_ids = filter_map_values_by_key_pattern(&view_data.branches, pattern)
.flat_map(|branch_target| branch_target.local_target.added_ids()) .flat_map(|branch_target| branch_target.local_target.added_ids())
.cloned() .cloned()
.collect(); .collect();
@ -2201,8 +2201,8 @@ fn resolve_commit_ref(
branch_pattern, branch_pattern,
remote_pattern, remote_pattern,
} => { } => {
let view = repo.view(); let view_data = repo.view().store_view();
let commit_ids = filter_map_values_by_key_pattern(view.branches(), branch_pattern) let commit_ids = filter_map_values_by_key_pattern(&view_data.branches, branch_pattern)
.flat_map(|branch_target| { .flat_map(|branch_target| {
filter_map_values_by_key_pattern(&branch_target.remote_targets, remote_pattern) filter_map_values_by_key_pattern(&branch_target.remote_targets, remote_pattern)
}) })