ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

revset: inline resolution of change/commit ids

Browse source 
This prepares for adding callbacks to resolve these ids.
This commit is contained in:
Martin von Zweigbergk 2023-05-05 16:45:52 -07:00 committed by Martin von Zweigbergk
parent c8648cb300
commit f66efcf6f9
1 changed files with 24 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
lib/src/revset.rs
View file

@ -1631,40 +1631,6 @@ fn resolve_full_commit_id(
}
}
fn resolve_short_commit_id(
repo: &dyn Repo,
symbol: &str,
) -> Result<Option<Vec<CommitId>>, RevsetResolutionError> {
if let Some(prefix) = HexPrefix::new(symbol) {
match repo.index().resolve_prefix(&prefix) {
PrefixResolution::NoMatch => Ok(None),
PrefixResolution::AmbiguousMatch => {
Err(RevsetResolutionError::AmbiguousIdPrefix(symbol.to_owned()))
}
PrefixResolution::SingleMatch(commit_id) => Ok(Some(vec![commit_id])),
}
} else {
Ok(None)
}
}
fn resolve_change_id(
repo: &dyn Repo,
symbol: &str,
) -> Result<Option<Vec<CommitId>>, RevsetResolutionError> {
if let Some(prefix) = to_forward_hex(symbol).as_deref().and_then(HexPrefix::new) {
match repo.resolve_change_id_prefix(&prefix) {
PrefixResolution::NoMatch => Ok(None),
PrefixResolution::AmbiguousMatch => {
Err(RevsetResolutionError::AmbiguousIdPrefix(symbol.to_owned()))
}
PrefixResolution::SingleMatch(entries) => Ok(Some(entries)),
}
} else {
Ok(None)
}
}
pub trait SymbolResolver {
fn resolve_symbol(&self, symbol: &str) -> Result<Vec<CommitId>, RevsetResolutionError>;
}
@ -1738,14 +1704,34 @@ impl SymbolResolver for DefaultSymbolResolver<'_> {
}
// Try to resolve as a commit id.
if let Some(ids) = resolve_short_commit_id(self.repo, symbol)? {
return Ok(ids);
if let Some(prefix) = HexPrefix::new(symbol) {
match self.repo.index().resolve_prefix(&prefix) {
PrefixResolution::AmbiguousMatch => {
return Err(RevsetResolutionError::AmbiguousIdPrefix(symbol.to_owned()));
}
PrefixResolution::SingleMatch(id) => {
return Ok(vec![id]);
}
PrefixResolution::NoMatch => {
// Fall through
}
}
}
// Try to resolve as a change id.
if let Some(ids) = resolve_change_id(self.repo, symbol)? {
if let Some(prefix) = to_forward_hex(symbol).as_deref().and_then(HexPrefix::new) {
match self.repo.resolve_change_id_prefix(&prefix) {
PrefixResolution::AmbiguousMatch => {
return Err(RevsetResolutionError::AmbiguousIdPrefix(symbol.to_owned()));
}
PrefixResolution::SingleMatch(ids) => {
return Ok(ids);
}
PrefixResolution::NoMatch => {
// Fall through
}
}
}
Err(RevsetResolutionError::NoSuchRevision(symbol.to_owned()))
}