This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11664

rhg: fix `hg cat` interaction with null revision
ClosedPublic

Authored by aalekseyev on Oct 14 2021, 2:05 PM.

Details

Reviewers
pulkit
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf8dc78716ad2: rhg: fix `hg cat` interaction with null revision

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

aalekseyev created this revision.Oct 14 2021, 2:05 PM
pulkit accepted this revision.Oct 14 2021, 2:42 PM
This revision is now accepted and ready to land.Oct 14 2021, 2:42 PM
aalekseyev added a comment.Oct 15 2021, 4:59 AM

I forgot to mention that this test was broken with a "panic" since 61ce70fd420e (sorry!).

pulkit added a comment.Oct 15 2021, 8:46 AM

This fails to apply on current tip of default branch, can you rebase and resend?

aalekseyev updated this revision to Diff 30838.Oct 15 2021, 9:38 AM
aalekseyev updated this revision to Diff 30839.Oct 15 2021, 9:41 AM
aalekseyev added a comment.Oct 15 2021, 9:41 AM

Rebased! (I think)

Alphare accepted this revision.Oct 18 2021, 5:43 AM
Alphare added a subscriber: Alphare.

Queued, thanks

aalekseyev added a commit: rHGf8dc78716ad2: rhg: fix `hg cat` interaction with null revision.Oct 18 2021, 5:49 AM
Closed by commit rHGf8dc78716ad2: rhg: fix `hg cat` interaction with null revision (authored by aalekseyev). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/revlog/revlog.rs (3 lines)
Mtests/test-rhg.t (4 lines)

Diff 30854

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

/// Returns `true` if the `Revlog` has zero `entries`. /// Returns `true` if the `Revlog` has zero `entries`.
pub fn is_empty(&self) -> bool { pub fn is_empty(&self) -> bool {
self.index.is_empty() self.index.is_empty()
} }
/// Returns the node ID for the given revision number, if it exists in this /// Returns the node ID for the given revision number, if it exists in this
/// revlog /// revlog
pub fn node_from_rev(&self, rev: Revision) -> Option<&Node> { pub fn node_from_rev(&self, rev: Revision) -> Option<&Node> {
if rev == NULL_REVISION {
return Some(&NULL_NODE);
}
Some(self.index.get_entry(rev)?.hash()) Some(self.index.get_entry(rev)?.hash())
} }
/// Return the revision number for the given node ID, if it exists in this /// Return the revision number for the given node ID, if it exists in this
/// revlog /// revlog
#[timed] #[timed]
pub fn rev_from_node( pub fn rev_from_node(
&self, &self,

tests/test-rhg.t

$ $NO_FALLBACK rhg cat --rev cf8b83 file-2 $ $NO_FALLBACK rhg cat --rev cf8b83 file-2
2 2
$ $NO_FALLBACK rhg cat -r c file-2 $ $NO_FALLBACK rhg cat -r c file-2
abort: ambiguous revision identifier: c abort: ambiguous revision identifier: c
[255] [255]
$ $NO_FALLBACK rhg cat -r d file-2 $ $NO_FALLBACK rhg cat -r d file-2
2 2
$ $NO_FALLBACK rhg cat -r 0000 file-2 $ $NO_FALLBACK rhg cat -r 0000 file-2
abort: invalid revision identifier: 0000 file-2: no such file in rev 000000000000
[255] [1]
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