This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11401

rust-revset: add separate match logic for shortcuts
ClosedPublic

Authored by Alphare on Sep 10 2021, 6:10 PM.

Details

Reviewers
SimonSapin
Group Reviewers
hg-reviewers
Commits
rHGddde80830aea: rust-revset: add separate match logic for shortcuts
Summary

The next change will add a shortcut for the . revision.
One day we might start matching tip and others, so this is an easy refactor.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Sep 10 2021, 6:10 PM
Alphare added a comment.Sep 10 2021, 6:11 PM

Those last two patches are pending CI refresh

Alphare edited parent revisions, added: D11403: rhg: fall back if subrepos are detected; removed: D11381: rhg: fallback if `defaults` config is set for the current command.Sep 13 2021, 11:39 AM
Alphare retitled this revision from rust-revset: simplify match logic to rust-revset: add separate match logic for shortcuts.
Alphare updated this revision to Diff 30218.
SimonSapin accepted this revision.Sep 14 2021, 11:14 AM
martinvonz added a subscriber: martinvonz.Sep 30 2021, 7:33 PM
martinvonz added inline comments.
rust/hg-core/src/revset.rs
32

This return looks unnecessary. Speaking of that, what do you think about running Clippy as part of the test suite?

Alphare added inline comments.Oct 1 2021, 3:32 AM
rust/hg-core/src/revset.rs
32

Ah yes, it became unnecessary indeed. I think clippy is nice most of the time, though sometimes it's overzealous, so we might need to decide which of its recommendations to ignore, but that shouldn't be too much of an issue.
@SimonSapin what do you think?

Alphare added a commit: rHGddde80830aea: rust-revset: add separate match logic for shortcuts.Oct 1 2021, 9:22 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGddde80830aea: rust-revset: add separate match logic for shortcuts (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/revset.rs (22 lines)

Diff 30494

rust/hg-core/src/revset.rs

/// ///
/// Only some of the revset language is implemented yet. /// Only some of the revset language is implemented yet.
pub fn resolve_single( pub fn resolve_single(
input: &str, input: &str,
repo: &Repo, repo: &Repo,
) -> Result<Revision, RevlogError> { ) -> Result<Revision, RevlogError> {
let changelog = repo.changelog()?; let changelog = repo.changelog()?;
match resolve_rev_number_or_hex_prefix(input, &changelog.revlog) { match input {
Err(RevlogError::InvalidRevision) => {} // Try other syntax "null" => return Ok(NULL_REVISION),
result => return result, _ => {}
}
if input == "null" {
return Ok(NULL_REVISION);
} }
match resolve_rev_number_or_hex_prefix(input, &changelog.revlog) {
Err(RevlogError::InvalidRevision) => {
// TODO: support for the rest of the language here. // TODO: support for the rest of the language here.
let msg = format!("cannot parse revset '{}'", input);
Err( Err(HgError::unsupported(msg).into())
HgError::unsupported(format!("cannot parse revset '{}'", input)) }
.into(), result => return result,
martinvonzUnsubmitted
Not Done

This return looks unnecessary. Speaking of that, what do you think about running Clippy as part of the test suite?

martinvonz: This `return` looks unnecessary. Speaking of that, what do you think about running Clippy as…
AlphareAuthorUnsubmitted
Done

Ah yes, it became unnecessary indeed. I think clippy is nice most of the time, though sometimes it's overzealous, so we might need to decide which of its recommendations to ignore, but that shouldn't be too much of an issue.
@SimonSapin what do you think?

Alphare: Ah yes, it became unnecessary indeed. I think `clippy` is nice most of the time, though…
) }
} }
/// Resolve the small subset of the language suitable for revlogs other than /// Resolve the small subset of the language suitable for revlogs other than
/// the changelog, such as in `hg debugdata --manifest` CLI argument. /// the changelog, such as in `hg debugdata --manifest` CLI argument.
/// ///
/// * A non-negative decimal integer for a revision number, or /// * A non-negative decimal integer for a revision number, or
/// * An hexadecimal string, for the unique node ID that starts with this /// * An hexadecimal string, for the unique node ID that starts with this
/// prefix /// prefix