# HG changeset patch # User Simon Sapin # Date 2021-09-14 16:10:35 # Node ID 6f579618ea7be1f1a310a65e659f9dbfef4a3230 # Parent 6c653d9d41b851ac0997ac537e1b51a3ef69cf1b rust: Rename the `Revlog::get_node_rev` method to `rev_from_node` This better describes the input and outputs of this method. Also rewrite the doc-comment, which seemed to have been left from copy-paste of another method. Differential Revision: https://phab.mercurial-scm.org/D11415 diff --git a/rust/hg-core/src/revlog/changelog.rs b/rust/hg-core/src/revlog/changelog.rs --- a/rust/hg-core/src/revlog/changelog.rs +++ b/rust/hg-core/src/revlog/changelog.rs @@ -22,7 +22,7 @@ impl Changelog { &self, node: NodePrefix, ) -> Result { - let rev = self.revlog.get_node_rev(node)?; + let rev = self.revlog.rev_from_node(node)?; self.get_rev(rev) } diff --git a/rust/hg-core/src/revlog/filelog.rs b/rust/hg-core/src/revlog/filelog.rs --- a/rust/hg-core/src/revlog/filelog.rs +++ b/rust/hg-core/src/revlog/filelog.rs @@ -30,7 +30,7 @@ impl Filelog { &self, file_node: impl Into, ) -> Result { - let file_rev = self.revlog.get_node_rev(file_node.into())?; + let file_rev = self.revlog.rev_from_node(file_node.into())?; self.get_rev(file_rev) } diff --git a/rust/hg-core/src/revlog/manifest.rs b/rust/hg-core/src/revlog/manifest.rs --- a/rust/hg-core/src/revlog/manifest.rs +++ b/rust/hg-core/src/revlog/manifest.rs @@ -20,7 +20,7 @@ impl Manifestlog { /// Return the `ManifestEntry` of a given node id. pub fn get_node(&self, node: NodePrefix) -> Result { - let rev = self.revlog.get_node_rev(node)?; + let rev = self.revlog.rev_from_node(node)?; self.get_rev(rev) } diff --git a/rust/hg-core/src/revlog/revlog.rs b/rust/hg-core/src/revlog/revlog.rs --- a/rust/hg-core/src/revlog/revlog.rs +++ b/rust/hg-core/src/revlog/revlog.rs @@ -124,9 +124,9 @@ impl Revlog { Some(self.index.get_entry(rev)?.hash()) } - /// Return the full data associated to a node. + /// Return the revision number for the given node ID, if it exists in this revlog #[timed] - pub fn get_node_rev( + pub fn rev_from_node( &self, node: NodePrefix, ) -> Result { diff --git a/rust/hg-core/src/revset.rs b/rust/hg-core/src/revset.rs --- a/rust/hg-core/src/revset.rs +++ b/rust/hg-core/src/revset.rs @@ -61,7 +61,7 @@ pub fn resolve_rev_number_or_hex_prefix( { return Err(RevlogError::WDirUnsupported); } - return revlog.get_node_rev(prefix); + return revlog.rev_from_node(prefix); } Err(RevlogError::InvalidRevision) }