This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9479

rhg: allow specifying a changeset ID prefix
ClosedPublic

Authored by SimonSapin on Dec 1 2020, 1:27 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8d6164098782: rhg: allow specifying a changeset ID prefix

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.Dec 1 2020, 1:27 PM
pulkit added a subscriber: pulkit.Dec 2 2020, 2:16 AM
pulkit added inline comments.
rust/hg-core/src/revlog/revlog.rs
102

Hmm, this seems to be incorrect. What if we have multiple hashes that start with the same prefix?

SimonSapin added inline comments.Dec 2 2020, 9:23 AM
rust/hg-core/src/revlog/revlog.rs
102

Oh that’s a good point. I’ve updated the patch to return an error for ambiguous prefixes, and added a corresponding variant to a few error types.

SimonSapin added inline comments.Dec 2 2020, 9:25 AM
tests/test-rhg.t
77–81

These random-looking changes exist to generate two changesets with a common prefix.

118

This is not the expected error message, for a reason unrelated to this patch. The next one fixes it.

pulkit accepted this revision.Dec 4 2020, 1:20 PM
This revision is now accepted and ready to land.Dec 4 2020, 1:20 PM
SimonSapin added a commit: rHG8d6164098782: rhg: allow specifying a changeset ID prefix.Dec 4 2020, 2:51 PM
Closed by commit rHG8d6164098782: rhg: allow specifying a changeset ID prefix (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 24016

rust/hg-core/src/operations/cat.rs

/// Kind of error encountered by `CatRev` /// Kind of error encountered by `CatRev`
#[derive(Debug)] #[derive(Debug)]
pub enum CatRevErrorKind { pub enum CatRevErrorKind {
/// Error when reading a `revlog` file. /// Error when reading a `revlog` file.
IoError(std::io::Error), IoError(std::io::Error),
/// The revision has not been found. /// The revision has not been found.
InvalidRevision, InvalidRevision,
/// Found more than one revision whose ID match the requested prefix
AmbiguousPrefix,
/// A `revlog` file is corrupted. /// A `revlog` file is corrupted.
CorruptedRevlog, CorruptedRevlog,
/// The `revlog` format version is not supported. /// The `revlog` format version is not supported.
UnsuportedRevlogVersion(u16), UnsuportedRevlogVersion(u16),
/// The `revlog` data format is not supported. /// The `revlog` data format is not supported.
UnknowRevlogDataFormat(u8), UnknowRevlogDataFormat(u8),
} }
impl From<RevlogError> for CatRevError { impl From<RevlogError> for CatRevError {
fn from(err: RevlogError) -> Self { fn from(err: RevlogError) -> Self {
match err { match err {
RevlogError::IoError(err) => CatRevErrorKind::IoError(err), RevlogError::IoError(err) => CatRevErrorKind::IoError(err),
RevlogError::UnsuportedVersion(version) => { RevlogError::UnsuportedVersion(version) => {
CatRevErrorKind::UnsuportedRevlogVersion(version) CatRevErrorKind::UnsuportedRevlogVersion(version)
} }
RevlogError::InvalidRevision => CatRevErrorKind::InvalidRevision, RevlogError::InvalidRevision => CatRevErrorKind::InvalidRevision,
RevlogError::AmbiguousPrefix => CatRevErrorKind::AmbiguousPrefix,
RevlogError::Corrupted => CatRevErrorKind::CorruptedRevlog, RevlogError::Corrupted => CatRevErrorKind::CorruptedRevlog,
RevlogError::UnknowDataFormat(format) => { RevlogError::UnknowDataFormat(format) => {
CatRevErrorKind::UnknowRevlogDataFormat(format) CatRevErrorKind::UnknowRevlogDataFormat(format)
} }
} }
.into() .into()
} }
} }

rust/hg-core/src/operations/debugdata.rs

/// Kind of error encountered by DebugData /// Kind of error encountered by DebugData
#[derive(Debug)] #[derive(Debug)]
pub enum DebugDataErrorKind { pub enum DebugDataErrorKind {
FindRootError(find_root::FindRootError), FindRootError(find_root::FindRootError),
/// Error when reading a `revlog` file. /// Error when reading a `revlog` file.
IoError(std::io::Error), IoError(std::io::Error),
/// The revision has not been found. /// The revision has not been found.
InvalidRevision, InvalidRevision,
/// Found more than one revision whose ID match the requested prefix
AmbiguousPrefix,
/// A `revlog` file is corrupted. /// A `revlog` file is corrupted.
CorruptedRevlog, CorruptedRevlog,
/// The `revlog` format version is not supported. /// The `revlog` format version is not supported.
UnsuportedRevlogVersion(u16), UnsuportedRevlogVersion(u16),
/// The `revlog` data format is not supported. /// The `revlog` data format is not supported.
UnknowRevlogDataFormat(u8), UnknowRevlogDataFormat(u8),
} }
match err { match err {
RevlogError::IoError(err) => DebugDataErrorKind::IoError(err), RevlogError::IoError(err) => DebugDataErrorKind::IoError(err),
RevlogError::UnsuportedVersion(version) => { RevlogError::UnsuportedVersion(version) => {
DebugDataErrorKind::UnsuportedRevlogVersion(version) DebugDataErrorKind::UnsuportedRevlogVersion(version)
} }
RevlogError::InvalidRevision => { RevlogError::InvalidRevision => {
DebugDataErrorKind::InvalidRevision DebugDataErrorKind::InvalidRevision
} }
RevlogError::AmbiguousPrefix => {
DebugDataErrorKind::AmbiguousPrefix
}
RevlogError::Corrupted => DebugDataErrorKind::CorruptedRevlog, RevlogError::Corrupted => DebugDataErrorKind::CorruptedRevlog,
RevlogError::UnknowDataFormat(format) => { RevlogError::UnknowDataFormat(format) => {
DebugDataErrorKind::UnknowRevlogDataFormat(format) DebugDataErrorKind::UnknowRevlogDataFormat(format)
} }
} }
.into() .into()
} }
} }

rust/hg-core/src/operations/list_tracked_files.rs

/// Kind of error encountered by `ListRevTrackedFiles` /// Kind of error encountered by `ListRevTrackedFiles`
#[derive(Debug)] #[derive(Debug)]
pub enum ListRevTrackedFilesErrorKind { pub enum ListRevTrackedFilesErrorKind {
/// Error when reading a `revlog` file. /// Error when reading a `revlog` file.
IoError(std::io::Error), IoError(std::io::Error),
/// The revision has not been found. /// The revision has not been found.
InvalidRevision, InvalidRevision,
/// Found more than one revision whose ID match the requested prefix
AmbiguousPrefix,
/// A `revlog` file is corrupted. /// A `revlog` file is corrupted.
CorruptedRevlog, CorruptedRevlog,
/// The `revlog` format version is not supported. /// The `revlog` format version is not supported.
UnsuportedRevlogVersion(u16), UnsuportedRevlogVersion(u16),
/// The `revlog` data format is not supported. /// The `revlog` data format is not supported.
UnknowRevlogDataFormat(u8), UnknowRevlogDataFormat(u8),
} }
ListRevTrackedFilesErrorKind::IoError(err) ListRevTrackedFilesErrorKind::IoError(err)
} }
RevlogError::UnsuportedVersion(version) => { RevlogError::UnsuportedVersion(version) => {
ListRevTrackedFilesErrorKind::UnsuportedRevlogVersion(version) ListRevTrackedFilesErrorKind::UnsuportedRevlogVersion(version)
} }
RevlogError::InvalidRevision => { RevlogError::InvalidRevision => {
ListRevTrackedFilesErrorKind::InvalidRevision ListRevTrackedFilesErrorKind::InvalidRevision
} }
RevlogError::AmbiguousPrefix => {
ListRevTrackedFilesErrorKind::AmbiguousPrefix
}
RevlogError::Corrupted => { RevlogError::Corrupted => {
ListRevTrackedFilesErrorKind::CorruptedRevlog ListRevTrackedFilesErrorKind::CorruptedRevlog
} }
RevlogError::UnknowDataFormat(format) => { RevlogError::UnknowDataFormat(format) => {
ListRevTrackedFilesErrorKind::UnknowRevlogDataFormat(format) ListRevTrackedFilesErrorKind::UnknowRevlogDataFormat(format)
} }
} }
.into() .into()

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

use super::node::{NODE_BYTES_LENGTH, NULL_NODE_ID}; use super::node::{NODE_BYTES_LENGTH, NULL_NODE_ID};
use super::patch; use super::patch;
use crate::revlog::Revision; use crate::revlog::Revision;
pub enum RevlogError { pub enum RevlogError {
IoError(std::io::Error), IoError(std::io::Error),
UnsuportedVersion(u16), UnsuportedVersion(u16),
InvalidRevision, InvalidRevision,
/// Found more than one entry whose ID match the requested prefix
AmbiguousPrefix,
Corrupted, Corrupted,
UnknowDataFormat(u8), UnknowDataFormat(u8),
} }
fn mmap_open(path: &Path) -> Result<Mmap, std::io::Error> { fn mmap_open(path: &Path) -> Result<Mmap, std::io::Error> {
let file = File::open(path)?; let file = File::open(path)?;
let mmap = unsafe { MmapOptions::new().map(&file) }?; let mmap = unsafe { MmapOptions::new().map(&file) }?;
Ok(mmap) Ok(mmap)
self.index.is_empty() self.index.is_empty()
} }
/// Return the full data associated to a node. /// Return the full data associated to a node.
#[timed] #[timed]
pub fn get_node_rev(&self, node: &[u8]) -> Result<Revision, RevlogError> { pub fn get_node_rev(&self, node: &[u8]) -> Result<Revision, RevlogError> {
// This is brute force. But it is fast enough for now. // This is brute force. But it is fast enough for now.
// Optimization will come later. // Optimization will come later.
let mut found_by_prefix = None;
for rev in (0..self.len() as Revision).rev() { for rev in (0..self.len() as Revision).rev() {
let index_entry = let index_entry =
self.index.get_entry(rev).ok_or(RevlogError::Corrupted)?; self.index.get_entry(rev).ok_or(RevlogError::Corrupted)?;
if node == index_entry.hash() { if index_entry.hash() == node {
pulkitUnsubmitted
Not Done

Hmm, this seems to be incorrect. What if we have multiple hashes that start with the same prefix?

pulkit: Hmm, this seems to be incorrect. What if we have multiple hashes that start with the same…
SimonSapinAuthorUnsubmitted
Done

Oh that’s a good point. I’ve updated the patch to return an error for ambiguous prefixes, and added a corresponding variant to a few error types.

SimonSapin: Oh that’s a good point. I’ve updated the patch to return an error for ambiguous prefixes, and…
return Ok(rev); return Ok(rev);
} }
if index_entry.hash().starts_with(node) {
if found_by_prefix.is_some() {
return Err(RevlogError::AmbiguousPrefix);
} }
Err(RevlogError::InvalidRevision) found_by_prefix = Some(rev)
}
}
found_by_prefix.ok_or(RevlogError::InvalidRevision)
} }
/// Return the full data associated to a revision. /// Return the full data associated to a revision.
/// ///
/// All entries required to build the final data out of deltas will be /// All entries required to build the final data out of deltas will be
/// retrieved as needed, and the deltas will be applied to the inital /// retrieved as needed, and the deltas will be applied to the inital
/// snapshot to rebuild the final data. /// snapshot to rebuild the final data.
#[timed] #[timed]

rust/rhg/src/commands/cat.rs

)), )),
CatRevErrorKind::InvalidRevision => CommandErrorKind::Abort(Some( CatRevErrorKind::InvalidRevision => CommandErrorKind::Abort(Some(
utf8_to_local(&format!( utf8_to_local(&format!(
"abort: invalid revision identifier {}\n", "abort: invalid revision identifier {}\n",
rev rev
)) ))
.into(), .into(),
)), )),
CatRevErrorKind::AmbiguousPrefix => CommandErrorKind::Abort(Some(
utf8_to_local(&format!(
"abort: ambiguous revision identifier {}\n",
rev
))
.into(),
)),
CatRevErrorKind::UnsuportedRevlogVersion(version) => { CatRevErrorKind::UnsuportedRevlogVersion(version) => {
CommandErrorKind::Abort(Some( CommandErrorKind::Abort(Some(
utf8_to_local(&format!( utf8_to_local(&format!(
"abort: unsupported revlog version {}\n", "abort: unsupported revlog version {}\n",
version version
)) ))
.into(), .into(),
)) ))

rust/rhg/src/commands/debugdata.rs

kind: CommandErrorKind::Abort(Some( kind: CommandErrorKind::Abort(Some(
utf8_to_local(&format!( utf8_to_local(&format!(
"abort: invalid revision identifier{}\n", "abort: invalid revision identifier{}\n",
rev rev
)) ))
.into(), .into(),
)), )),
}, },
DebugDataErrorKind::AmbiguousPrefix => CommandError {
kind: CommandErrorKind::Abort(Some(
utf8_to_local(&format!(
"abort: ambiguous revision identifier{}\n",
rev
))
.into(),
)),
},
DebugDataErrorKind::UnsuportedRevlogVersion(version) => CommandError { DebugDataErrorKind::UnsuportedRevlogVersion(version) => CommandError {
kind: CommandErrorKind::Abort(Some( kind: CommandErrorKind::Abort(Some(
utf8_to_local(&format!( utf8_to_local(&format!(
"abort: unsupported revlog version {}\n", "abort: unsupported revlog version {}\n",
version version
)) ))
.into(), .into(),
)), )),

rust/rhg/src/commands/files.rs

CommandErrorKind::Abort(Some( CommandErrorKind::Abort(Some(
utf8_to_local(&format!( utf8_to_local(&format!(
"abort: invalid revision identifier {}\n", "abort: invalid revision identifier {}\n",
rev rev
)) ))
.into(), .into(),
)) ))
} }
ListRevTrackedFilesErrorKind::AmbiguousPrefix => {
CommandErrorKind::Abort(Some(
utf8_to_local(&format!(
"abort: ambiguous revision identifier {}\n",
rev
))
.into(),
))
}
ListRevTrackedFilesErrorKind::UnsuportedRevlogVersion(version) => { ListRevTrackedFilesErrorKind::UnsuportedRevlogVersion(version) => {
CommandErrorKind::Abort(Some( CommandErrorKind::Abort(Some(
utf8_to_local(&format!( utf8_to_local(&format!(
"abort: unsupported revlog version {}\n", "abort: unsupported revlog version {}\n",
version version
)) ))
.into(), .into(),
)) ))

tests/test-rhg.t

$ rhg files | head -n 1 $ rhg files | head -n 1
../../../file1 ../../../file1
Debuging data in inline index Debuging data in inline index
$ cd $TESTTMP $ cd $TESTTMP
$ rm -rf repository $ rm -rf repository
$ hg init repository $ hg init repository
$ cd repository $ cd repository
$ for i in 1 2 3; do $ for i in 1 2 3 4 5 6; do
> echo $i >> file$i > echo $i >> file-$i
> hg add file$i > hg add file-$i
> hg commit -m "commit $i" -q > hg commit -m "Commit $i" -q
> done > done
SimonSapinAuthorUnsubmitted
Done

These random-looking changes exist to generate two changesets with a common prefix.

SimonSapin: These random-looking changes exist to generate two changesets with a common prefix.
$ rhg debugdata -c 2 $ rhg debugdata -c 2
e36fa63d37a576b27a69057598351db6ee5746bd 8d0267cb034247ebfa5ee58ce59e22e57a492297
test test
0 0 0 0
file3 file-3
commit 3 (no-eol) Commit 3 (no-eol)
$ rhg debugdata -m 2 $ rhg debugdata -m 2
file1\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc) file-1\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc)
file2\x005d9299349fc01ddd25d0070d149b124d8f10411e (esc) file-2\x005d9299349fc01ddd25d0070d149b124d8f10411e (esc)
file3\x002661d26c649684b482d10f91960cc3db683c38b4 (esc) file-3\x002661d26c649684b482d10f91960cc3db683c38b4 (esc)
Debuging with full node id Debuging with full node id
$ rhg debugdata -c `hg log -r 0 -T '{node}'` $ rhg debugdata -c `hg log -r 0 -T '{node}'`
c8e64718e1ca0312eeee0f59d37f8dc612793856 d1d1c679d3053e8926061b6f45ca52009f011e3f
test test
0 0 0 0
file1 file-1
Commit 1 (no-eol)
commit 1 (no-eol) Specifying revisions by changeset ID
$ hg log -T '{node}\n'
c6ad58c44207b6ff8a4fbbca7045a5edaa7e908b
d654274993d0149eecc3cc03214f598320211900
f646af7e96481d3a5470b695cf30ad8e3ab6c575
cf8b83f14ead62b374b6e91a0e9303b85dfd9ed7
91c6f6e73e39318534dc415ea4e8a09c99cd74d6
6ae9681c6d30389694d8701faf24b583cf3ccafe
$ rhg files -r cf8b83
file-1
file-2
file-3
$ rhg cat -r cf8b83 file-2
2
$ rhg cat -r c file-2
abort: invalid revision identifier c
SimonSapinAuthorUnsubmitted
Done

This is not the expected error message, for a reason unrelated to this patch. The next one fixes it.

SimonSapin: This is not the expected error message, for a reason unrelated to this patch. The next one…
[255]
Cat files Cat files
$ cd $TESTTMP $ cd $TESTTMP
$ rm -rf repository $ rm -rf repository
$ hg init repository $ hg init repository
$ cd repository $ cd repository
$ echo "original content" > original $ echo "original content" > original
$ hg add original $ hg add original
$ hg commit -m "add original" original $ hg commit -m "add original" original
$ rhg cat -r 0 original $ rhg cat -r 0 original
original content original content
Cat copied file should not display copy metadata Cat copied file should not display copy metadata
$ hg copy original copy_of_original $ hg copy original copy_of_original
$ hg commit -m "add copy of original" $ hg commit -m "add copy of original"
$ rhg cat -r 1 copy_of_original $ rhg cat -r 1 copy_of_original
original content original content
Specifying revisions by changeset ID
$ hg log
changeset: 1:41263439dc17
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add copy of original
changeset: 0:1c9e69808da7
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add original
$ rhg files -r 41263439dc17
abort: invalid revision identifier 41263439dc17
[255]
$ rhg cat -r 41263439dc17 original
abort: invalid revision identifier 41263439dc17
[255]
Requirements Requirements
$ rhg debugrequirements $ rhg debugrequirements
dotencode dotencode
fncache fncache
generaldelta generaldelta
revlogv1 revlogv1
sparserevlog sparserevlog
store store