Mercurial > public > mercurial-scm > hg
comparison mercurial/revlog.py @ 47384:fec306b05328
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
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 27 May 2021 03:28:15 +0200 |
parents | d6a52783d2ba |
children | 9d9eb22b9b69 |
comparison
equal
deleted
inserted
replaced
47383:659a452ee263 | 47384:fec306b05328 |
---|---|
3107 # (Possibly) reuse the delta from the revlog if allowed and | 3107 # (Possibly) reuse the delta from the revlog if allowed and |
3108 # the revlog chunk is a delta. | 3108 # the revlog chunk is a delta. |
3109 cachedelta = None | 3109 cachedelta = None |
3110 rawtext = None | 3110 rawtext = None |
3111 if deltareuse == self.DELTAREUSEFULLADD: | 3111 if deltareuse == self.DELTAREUSEFULLADD: |
3112 text, sidedata = self._revisiondata(rev) | 3112 text = self._revisiondata(rev)[0] |
3113 sidedata = self.sidedata(rev) | |
3113 | 3114 |
3114 if sidedata_helpers is not None: | 3115 if sidedata_helpers is not None: |
3115 (sidedata, new_flags) = sidedatautil.run_sidedata_helpers( | 3116 (sidedata, new_flags) = sidedatautil.run_sidedata_helpers( |
3116 self, sidedata_helpers, sidedata, rev | 3117 self, sidedata_helpers, sidedata, rev |
3117 ) | 3118 ) |
3135 if dp != nullrev: | 3136 if dp != nullrev: |
3136 cachedelta = (dp, bytes(self._chunk(rev))) | 3137 cachedelta = (dp, bytes(self._chunk(rev))) |
3137 | 3138 |
3138 sidedata = None | 3139 sidedata = None |
3139 if not cachedelta: | 3140 if not cachedelta: |
3140 rawtext, sidedata = self._revisiondata(rev) | 3141 rawtext = self._revisiondata(rev)[0] |
3142 sidedata = self.sidedata(rev) | |
3141 if sidedata is None: | 3143 if sidedata is None: |
3142 sidedata = self.sidedata(rev) | 3144 sidedata = self.sidedata(rev) |
3143 | 3145 |
3144 if sidedata_helpers is not None: | 3146 if sidedata_helpers is not None: |
3145 (sidedata, new_flags) = sidedatautil.run_sidedata_helpers( | 3147 (sidedata, new_flags) = sidedatautil.run_sidedata_helpers( |