Mercurial > public > mercurial-scm > hg

diff rust/hg-core/src/revlog/filelog.rs @ 52290:a3fa37bdb7ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust: normalize `_for_unchecked_rev` naming among revlogs and the index This normalizes the naming scheme between the `Revlog`, `Changelog`, etc. which is less suprising, though no real bugs could stem from this because of the type signature mismatch. The very high-level `Repo` object still uses an `UncheckedRevision` parameter for its methods because that's what most callers will want.
author Rapha?l Gom?s <rgomes@octobus.net>
date Tue, 29 Oct 2024 11:00:04 +0100
parents 039b7caeb4d9
children f90796d33aa0
line wrap: on
line diff
--- a/rust/hg-core/src/revlog/filelog.rs	Tue Nov 12 12:45:23 2024 +0100
+++ b/rust/hg-core/src/revlog/filelog.rs	Tue Oct 29 11:00:04 2024 +0100
@@ -56,16 +56,19 @@
         file_node: impl Into<NodePrefix>,
     ) -> Result<FilelogRevisionData, RevlogError> {
         let file_rev = self.revlog.rev_from_node(file_node.into())?;
-        self.data_for_rev(file_rev.into())
+        self.data_for_unchecked_rev(file_rev.into())
     }
 
     /// The given revision is that of the file as found in a filelog, not of a
     /// changeset.
-    pub fn data_for_rev(
+    pub fn data_for_unchecked_rev(
         &self,
         file_rev: UncheckedRevision,
     ) -> Result<FilelogRevisionData, RevlogError> {
-        let data: Vec<u8> = self.revlog.get_rev_data(file_rev)?.into_owned();
+        let data: Vec<u8> = self
+            .revlog
+            .get_data_for_unchecked_rev(file_rev)?
+            .into_owned();
         Ok(FilelogRevisionData(data))
     }
 
@@ -76,25 +79,26 @@
         file_node: impl Into<NodePrefix>,
     ) -> Result<FilelogEntry, RevlogError> {
         let file_rev = self.revlog.rev_from_node(file_node.into())?;
-        self.entry_for_checked_rev(file_rev)
+        self.entry(file_rev)
     }
 
     /// The given revision is that of the file as found in a filelog, not of a
     /// changeset.
-    pub fn entry_for_rev(
+    pub fn entry_for_unchecked_rev(
         &self,
         file_rev: UncheckedRevision,
     ) -> Result<FilelogEntry, RevlogError> {
-        Ok(FilelogEntry(self.revlog.get_entry(file_rev)?))
+        Ok(FilelogEntry(
+            self.revlog.get_entry_for_unchecked_rev(file_rev)?,
+        ))
     }
 
-    fn entry_for_checked_rev(
+    /// Same as [`Self::entry_for_unchecked_rev`] for a checked revision.
+    pub fn entry(
         &self,
         file_rev: Revision,
     ) -> Result<FilelogEntry, RevlogError> {
-        Ok(FilelogEntry(
-            self.revlog.get_entry_for_checked_rev(file_rev)?,
-        ))
+        Ok(FilelogEntry(self.revlog.get_entry(file_rev)?))
     }
 }