revlog: use `self.sidedata` directly in `revlog.clone`
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 27 May 2021 03:28:15 +0200
changeset 47384 fec306b05328
parent 47383 659a452ee263
child 47385 9d9eb22b9b69
revlog: use `self.sidedata` directly in `revlog.clone` We want to change `revlog._revisiondata` signature, so we need to migrate users away. Differential Revision: https://phab.mercurial-scm.org/D10782
mercurial/revlog.py
--- a/mercurial/revlog.py	Thu May 27 03:23:34 2021 +0200
+++ b/mercurial/revlog.py	Thu May 27 03:28:15 2021 +0200
@@ -3109,7 +3109,8 @@
             cachedelta = None
             rawtext = None
             if deltareuse == self.DELTAREUSEFULLADD:
-                text, sidedata = self._revisiondata(rev)
+                text = self._revisiondata(rev)[0]
+                sidedata = self.sidedata(rev)
 
                 if sidedata_helpers is not None:
                     (sidedata, new_flags) = sidedatautil.run_sidedata_helpers(
@@ -3137,7 +3138,8 @@
 
                 sidedata = None
                 if not cachedelta:
-                    rawtext, sidedata = self._revisiondata(rev)
+                    rawtext = self._revisiondata(rev)[0]
+                    sidedata = self.sidedata(rev)
                 if sidedata is None:
                     sidedata = self.sidedata(rev)