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

id_prefix: add IdIndex::resolve_prefix()

Browse source 
I'll use this in `IdPrefixContext` soon.
This commit is contained in:
Martin von Zweigbergk 2023-05-07 08:42:16 -07:00 committed by Martin von Zweigbergk
parent f657bcb6ae
commit 481b8c5d0e
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/src/id_prefix.rs
View file

@ -86,6 +86,15 @@ where
} }
} }
/// Looks up entries with the given prefix, and collects values if matched
/// entries have unambiguous keys.
pub fn resolve_prefix(&self, prefix: &HexPrefix) -> PrefixResolution<Vec<V>>
where
V: Clone,
{
self.resolve_prefix_with(prefix, |v: &V| v.clone())
}
/// Iterates over entries with the given prefix. /// Iterates over entries with the given prefix.
pub fn resolve_prefix_range<'a: 'b, 'b>( pub fn resolve_prefix_range<'a: 'b, 'b>(
&'a self, &'a self,
@ -150,35 +159,35 @@ mod tests {
(ChangeId::from_hex("0aab"), 4), (ChangeId::from_hex("0aab"), 4),
]); ]);
assert_eq!( assert_eq!(
id_index.resolve_prefix_with(&HexPrefix::new("0").unwrap(), |&v| v), id_index.resolve_prefix(&HexPrefix::new("0").unwrap()),
PrefixResolution::AmbiguousMatch, PrefixResolution::AmbiguousMatch,
); );
assert_eq!( assert_eq!(
id_index.resolve_prefix_with(&HexPrefix::new("00").unwrap(), |&v| v), id_index.resolve_prefix(&HexPrefix::new("00").unwrap()),
PrefixResolution::AmbiguousMatch, PrefixResolution::AmbiguousMatch,
); );
assert_eq!( assert_eq!(
id_index.resolve_prefix_with(&HexPrefix::new("000").unwrap(), |&v| v), id_index.resolve_prefix(&HexPrefix::new("000").unwrap()),
PrefixResolution::SingleMatch(vec![0]), PrefixResolution::SingleMatch(vec![0]),
); );
assert_eq!( assert_eq!(
id_index.resolve_prefix_with(&HexPrefix::new("0001").unwrap(), |&v| v), id_index.resolve_prefix(&HexPrefix::new("0001").unwrap()),
PrefixResolution::NoMatch, PrefixResolution::NoMatch,
); );
assert_eq!( assert_eq!(
sorted(id_index.resolve_prefix_with(&HexPrefix::new("009").unwrap(), |&v| v)), sorted(id_index.resolve_prefix(&HexPrefix::new("009").unwrap())),
PrefixResolution::SingleMatch(vec![1, 2]), PrefixResolution::SingleMatch(vec![1, 2]),
); );
assert_eq!( assert_eq!(
id_index.resolve_prefix_with(&HexPrefix::new("0aa").unwrap(), |&v| v), id_index.resolve_prefix(&HexPrefix::new("0aa").unwrap()),
PrefixResolution::AmbiguousMatch, PrefixResolution::AmbiguousMatch,
); );
assert_eq!( assert_eq!(
id_index.resolve_prefix_with(&HexPrefix::new("0aab").unwrap(), |&v| v), id_index.resolve_prefix(&HexPrefix::new("0aab").unwrap()),
PrefixResolution::SingleMatch(vec![4]), PrefixResolution::SingleMatch(vec![4]),
); );
assert_eq!( assert_eq!(
id_index.resolve_prefix_with(&HexPrefix::new("f").unwrap(), |&v| v), id_index.resolve_prefix(&HexPrefix::new("f").unwrap()),
PrefixResolution::NoMatch, PrefixResolution::NoMatch,
); );
} }