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

revset: remove code for conflict between commit/change id

Browse source 
Commit ids and change ids now use non-overlapping symbols for their
digits, so they can't share a prefix.
This commit is contained in:
Martin von Zweigbergk 2023-02-12 20:45:31 -08:00 committed by Martin von Zweigbergk
parent 9261bfe5fc
commit 04a0c60b16
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/src/revset.rs
View file

@ -179,17 +179,17 @@ pub fn resolve_symbol(
return Ok(ids);
}
// Try to resolve as a commit/change id.
match (
resolve_short_commit_id(repo, symbol)?,
resolve_change_id(repo, symbol)?,
) {
// Likely a root_commit_id, but not limited to it.
(Some(ids1), Some(ids2)) if ids1 == ids2 => Ok(ids1),
(Some(_), Some(_)) => Err(RevsetError::AmbiguousIdPrefix(symbol.to_owned())),
(Some(ids), None) | (None, Some(ids)) => Ok(ids),
(None, None) => Err(RevsetError::NoSuchRevision(symbol.to_owned())),
// Try to resolve as a commit id.
if let Some(ids) = resolve_short_commit_id(repo, symbol)? {
return Ok(ids);
}
// Try to resolve as a change id.
if let Some(ids) = resolve_change_id(repo, symbol)? {
return Ok(ids);
}
Err(RevsetError::NoSuchRevision(symbol.to_owned()))
}
}