This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10097

rhg: Fall back to Python for unsupported revset syntax
ClosedPublic

Authored by SimonSapin on Mar 3 2021, 12:09 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGdf247f58ecee: rhg: Fall back to Python for unsupported revset syntax
Summary

rhg only supports a small subset of the syntax.
On parse error, this gives Python a chance instead of aborting immediately.

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

SimonSapin created this revision.Mar 3 2021, 12:09 PM
baymax updated this revision to Diff 26071.Mar 4 2021, 8:00 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Mar 5 2021, 3:48 AM
marmoute added a subscriber: marmoute.Mar 9 2021, 1:01 PM

(small nits: the description should not start with a Capital doesn't check-commit catch that?)

SimonSapin edited the summary of this revision. (Show Details)Mar 12 2021, 5:06 PM
SimonSapin added a commit: rHGdf247f58ecee: rhg: Fall back to Python for unsupported revset syntax.Mar 16 2021, 5:44 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGdf247f58ecee: rhg: Fall back to Python for unsupported revset syntax (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 26406

rust/hg-core/src/revset.rs

//! The revset query language //! The revset query language
//! //!
//! <https://www.mercurial-scm.org/repo/hg/help/revsets> //! <https://www.mercurial-scm.org/repo/hg/help/revsets>
use crate::errors::HgError;
use crate::repo::Repo; use crate::repo::Repo;
use crate::revlog::changelog::Changelog; use crate::revlog::changelog::Changelog;
use crate::revlog::revlog::{Revlog, RevlogError}; use crate::revlog::revlog::{Revlog, RevlogError};
use crate::revlog::NodePrefix; use crate::revlog::NodePrefix;
use crate::revlog::{Revision, NULL_REVISION}; use crate::revlog::{Revision, NULL_REVISION};
/// Resolve a query string into a single revision. /// Resolve a query string into a single revision.
/// ///
} }
if input == "null" { if input == "null" {
return Ok(NULL_REVISION); return Ok(NULL_REVISION);
} }
// TODO: support for the rest of the language here. // TODO: support for the rest of the language here.
Err(RevlogError::InvalidRevision) Err(
HgError::unsupported(format!("cannot parse revset '{}'", input))
.into(),
)
} }
/// 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