From patchwork Tue Sep 24 16:48:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D6814: revlog: add a `sidedata` parameters to addrevision From: phabricator X-Patchwork-Id: 41746 Message-Id: <677848167f46130d5dd5690848209487@localhost.localdomain> To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Tue, 24 Sep 2019 16:48:16 +0000 marmoute marked an inline comment as done. marmoute updated this revision to Diff 16601. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6814?vs=16600&id=16601 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6814/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6814 AFFECTED FILES hgext/remotefilelog/remotefilelog.py mercurial/revlog.py CHANGE DETAILS To: marmoute, yuja, durin42, indygreg, #hg-reviewers Cc: mercurial-devel diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -1816,7 +1816,8 @@ """ def addrevision(self, text, transaction, link, p1, p2, cachedelta=None, - node=None, flags=REVIDX_DEFAULT_FLAGS, deltacomputer=None): + node=None, flags=REVIDX_DEFAULT_FLAGS, deltacomputer=None, + sidedata=None): """add a revision to the log text - the revision data to add @@ -1835,6 +1836,9 @@ raise error.RevlogError(_("attempted to add linkrev -1 to %s") % self.indexfile) + if sidedata is None: + sidedata = {} + if flags: node = node or self.hash(text, p1, p2) diff --git a/hgext/remotefilelog/remotefilelog.py b/hgext/remotefilelog/remotefilelog.py --- a/hgext/remotefilelog/remotefilelog.py +++ b/hgext/remotefilelog/remotefilelog.py @@ -129,10 +129,13 @@ return data def addrevision(self, text, transaction, linknode, p1, p2, cachedelta=None, - node=None, flags=revlog.REVIDX_DEFAULT_FLAGS): + node=None, flags=revlog.REVIDX_DEFAULT_FLAGS, + sidedata=None): # text passed to "addrevision" includes hg filelog metadata header if node is None: node = storageutil.hashrevisionsha1(text, p1, p2) + if sidedata is None: + sidedata = {} meta, metaoffset = storageutil.parsemeta(text) rawtext, validatehash = self._processflagswrite(text, flags)