( )⚙ D10254 rhg: raise wdir specific error for `hg debugdata`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10254

rhg: raise wdir specific error for `hg debugdata`
ClosedPublic

Authored by pulkit on Mar 23 2021, 4:39 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe8ae91b1a63d: rhg: raise wdir specific error for `hg debugdata`
Summary

Helps remove the conditional in test-debugcommands.t for rhg.

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

pulkit created this revision.Mar 23 2021, 4:39 PM
SimonSapin added a subscriber: SimonSapin.Mar 25 2021, 11:48 AM
SimonSapin added inline comments.
rust/hg-core/src/revset.rs
54–56

Although tests don’t cover this it looks like Python code also recognizes hex prefixes of WORKING_DIRECTORY_REV, for example hg debugdata -c fffff. This could be based on is_prefix_of after creating a NodePrefix.

(I also just found a pre-existing bug: to match Python NodePrefix::from_hex should only accept input with 5 or more hex digits)

pulkit updated this revision to Diff 26576.Mar 25 2021, 5:01 PM
pulkit added a commit: rHGe8ae91b1a63d: rhg: raise wdir specific error for `hg debugdata`.Mar 25 2021, 5:28 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe8ae91b1a63d: rhg: raise wdir specific error for `hg debugdata` (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 26578

rust/hg-core/src/revlog.rs

/// Same as `mercurial.node.wdirrev` /// Same as `mercurial.node.wdirrev`
/// ///
/// This is also equal to `i32::max_value()`, but it's better to spell /// This is also equal to `i32::max_value()`, but it's better to spell
/// it out explicitely, same as in `mercurial.node` /// it out explicitely, same as in `mercurial.node`
#[allow(clippy::unreadable_literal)] #[allow(clippy::unreadable_literal)]
pub const WORKING_DIRECTORY_REVISION: Revision = 0x7fffffff; pub const WORKING_DIRECTORY_REVISION: Revision = 0x7fffffff;
pub const WORKING_DIRECTORY_HEX: &str =
"ffffffffffffffffffffffffffffffffffffffff";
/// The simplest expression of what we need of Mercurial DAGs. /// The simplest expression of what we need of Mercurial DAGs.
pub trait Graph { pub trait Graph {
/// Return the two parents of the given `Revision`. /// Return the two parents of the given `Revision`.
/// ///
/// Each of the parents can be independently `NULL_REVISION` /// Each of the parents can be independently `NULL_REVISION`
fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError>; fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError>;
} }

rust/hg-core/src/revlog/revlog.rs

use super::patch; use super::patch;
use crate::errors::HgError; use crate::errors::HgError;
use crate::repo::Repo; use crate::repo::Repo;
use crate::revlog::Revision; use crate::revlog::Revision;
#[derive(derive_more::From)] #[derive(derive_more::From)]
pub enum RevlogError { pub enum RevlogError {
InvalidRevision, InvalidRevision,
/// Working directory is not supported
WDirUnsupported,
/// Found more than one entry whose ID match the requested prefix /// Found more than one entry whose ID match the requested prefix
AmbiguousPrefix, AmbiguousPrefix,
#[from] #[from]
Other(HgError), Other(HgError),
} }
impl From<NodeMapError> for RevlogError { impl From<NodeMapError> for RevlogError {
fn from(error: NodeMapError) -> Self { fn from(error: NodeMapError) -> Self {

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::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, WORKING_DIRECTORY_HEX};
use crate::Node;
/// Resolve a query string into a single revision. /// Resolve a query string into a single revision.
/// ///
/// 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> {
input: &str, input: &str,
revlog: &Revlog, revlog: &Revlog,
) -> Result<Revision, RevlogError> { ) -> Result<Revision, RevlogError> {
if let Ok(integer) = input.parse::<i32>() { if let Ok(integer) = input.parse::<i32>() {
if integer >= 0 && revlog.has_rev(integer) { if integer >= 0 && revlog.has_rev(integer) {
return Ok(integer); return Ok(integer);
} }
} }
if let Ok(prefix) = NodePrefix::from_hex(input) { if let Ok(prefix) = NodePrefix::from_hex(input) {
if prefix.is_prefix_of(&Node::from_hex(WORKING_DIRECTORY_HEX).unwrap())
{
SimonSapinUnsubmitted
Not Done

Although tests don’t cover this it looks like Python code also recognizes hex prefixes of WORKING_DIRECTORY_REV, for example hg debugdata -c fffff. This could be based on is_prefix_of after creating a NodePrefix.

(I also just found a pre-existing bug: to match Python NodePrefix::from_hex should only accept input with 5 or more hex digits)

SimonSapin: Although tests don’t cover this it looks like Python code also recognizes hex prefixes of…
return Err(RevlogError::WDirUnsupported);
}
return revlog.get_node_rev(prefix); return revlog.get_node_rev(prefix);
} }
Err(RevlogError::InvalidRevision) Err(RevlogError::InvalidRevision)
} }

rust/rhg/src/error.rs

detailed_exit_code: exitcode::CONFIG_ERROR_ABORT, detailed_exit_code: exitcode::CONFIG_ERROR_ABORT,
} }
} }
} }
impl From<(RevlogError, &str)> for CommandError { impl From<(RevlogError, &str)> for CommandError {
fn from((err, rev): (RevlogError, &str)) -> CommandError { fn from((err, rev): (RevlogError, &str)) -> CommandError {
match err { match err {
RevlogError::WDirUnsupported => CommandError::abort(
"abort: working directory revision cannot be specified",
),
RevlogError::InvalidRevision => CommandError::abort(format!( RevlogError::InvalidRevision => CommandError::abort(format!(
"abort: invalid revision identifier: {}", "abort: invalid revision identifier: {}",
rev rev
)), )),
RevlogError::AmbiguousPrefix => CommandError::abort(format!( RevlogError::AmbiguousPrefix => CommandError::abort(format!(
"abort: ambiguous revision identifier: {}", "abort: ambiguous revision identifier: {}",
rev rev
)), )),

tests/test-debugcommands.t

lock: free lock: free
wlock: free wlock: free
$ touch .hg/unlock $ touch .hg/unlock
$ wait $ wait
Test WdirUnsupported exception Test WdirUnsupported exception
#if no-rhg
$ hg debugdata -c ffffffffffffffffffffffffffffffffffffffff $ hg debugdata -c ffffffffffffffffffffffffffffffffffffffff
abort: working directory revision cannot be specified abort: working directory revision cannot be specified
[255] [255]
#else
TODO: add rhg support for (at least parsing) the working directory pseudo-changeset
$ hg debugdata -c ffffffffffffffffffffffffffffffffffffffff
abort: working directory revision cannot be specified (missing-correct-output !)
abort: invalid revision identifier: ffffffffffffffffffffffffffffffffffffffff (known-bad-output !)
[255]
#endif
Test cache warming command Test cache warming command
$ rm -rf .hg/cache/ $ rm -rf .hg/cache/
$ hg debugupdatecaches --debug $ hg debugupdatecaches --debug
updating the branch cache updating the branch cache
$ ls -r .hg/cache/* $ ls -r .hg/cache/*
.hg/cache/tags2-served .hg/cache/tags2-served