Patchwork D10782: revlog: use `self.sidedata` directly in `revlog.clone`

login
register
mail settings
Submitter phabricator
Date May 28, 2021, 10:58 p.m.
Message ID <differential-rev-PHID-DREV-5mzwmiqcvucaq3uz43vr-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49102/
State Superseded
Headers show

Comments

phabricator - May 28, 2021, 10:58 p.m.
marmoute created this revision.
Herald added a reviewer: indygreg.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  We want to change `revlog._revisiondata` signature, so we need to migrate users
  away.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10782

AFFECTED FILES
  mercurial/revlog.py

CHANGE DETAILS




To: marmoute, indygreg, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -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)