From patchwork Fri May 28 22:58:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D10782: revlog: use `self.sidedata` directly in `revlog.clone` From: phabricator X-Patchwork-Id: 49102 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Fri, 28 May 2021 22:58:14 +0000 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 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)