mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

repo: get change id index from revset also for mutable repo

Browse source 
I don't know if we ever resolve revsets in a mutable repo, but now
that we can get a change id index from a revset, it's easier to
implement this functionality that way.
This commit is contained in:
Martin von Zweigbergk 2023-03-20 16:19:19 -07:00 committed by Martin von Zweigbergk
parent 68cff2fa22
commit 13a000caa7
1 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/src/repo.rs
View file

@ -1158,29 +1158,15 @@ impl Repo for MutableRepo {
} }
fn resolve_change_id_prefix(&self, prefix: &HexPrefix) -> PrefixResolution<Vec<CommitId>> { fn resolve_change_id_prefix(&self, prefix: &HexPrefix) -> PrefixResolution<Vec<CommitId>> {
// TODO: Create a persistent lookup from change id to (visible?) commit ids. let revset = RevsetExpression::all().evaluate(self).unwrap();
let mut found_change_id = None; let change_id_index = revset.change_id_index();
let mut found_commits = vec![]; change_id_index.resolve_prefix(prefix)
let heads = self.view().heads().iter().cloned().collect_vec();
for entry in self.index().walk_revs(&heads, &[]) {
let change_id = entry.change_id();
if prefix.matches(&change_id) {
if let Some(previous_change_id) = found_change_id.replace(change_id.clone()) {
if previous_change_id != change_id {
return PrefixResolution::AmbiguousMatch;
}
}
found_commits.push(entry.commit_id());
}
}
if found_change_id.is_none() {
return PrefixResolution::NoMatch;
}
PrefixResolution::SingleMatch(found_commits)
} }
fn shortest_unique_change_id_prefix_len(&self, target_id: &ChangeId) -> usize { fn shortest_unique_change_id_prefix_len(&self, target_id: &ChangeId) -> usize {
target_id.as_bytes().len() * 2 // TODO let revset = RevsetExpression::all().evaluate(self).unwrap();
let change_id_index = revset.change_id_index();
change_id_index.shortest_unique_prefix_len(target_id)
} }
} }