From patchwork Mon Sep 9 23:10:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D6815: flagprocessors: add a `sidedata` parameters to _processflagswrite From: phabricator X-Patchwork-Id: 41622 Message-Id: <424faf3b0993de63696fff21b08b216d@localhost.localdomain> To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Mon, 9 Sep 2019 23:10:37 +0000 marmoute updated this revision to Diff 16495. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6815?vs=16481&id=16495 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6815/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6815 AFFECTED FILES hgext/remotefilelog/remotefilelog.py mercurial/revlog.py mercurial/revlogutils/flagutil.py CHANGE DETAILS To: marmoute, yuja, durin42, indygreg, #hg-reviewers Cc: mercurial-devel diff --git a/mercurial/revlogutils/flagutil.py b/mercurial/revlogutils/flagutil.py --- a/mercurial/revlogutils/flagutil.py +++ b/mercurial/revlogutils/flagutil.py @@ -120,7 +120,7 @@ """ return self._processflagsfunc(text, flags, 'read') - def _processflagswrite(self, text, flags): + def _processflagswrite(self, text, flags, sidedata): """Inspect revision data flags and applies write transformations defined by registered flag processors. @@ -136,6 +136,7 @@ processed text and ``validatehash`` is a bool indicating whether the returned text should be checked for hash integrity. """ + assert not sidedata # XXX until it is actually processed return self._processflagsfunc(text, flags, 'write')[:2] def _processflagsraw(self, text, flags): diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -1842,7 +1842,8 @@ if flags: node = node or self.hash(text, p1, p2) - rawtext, validatehash = self._processflagswrite(text, flags) + rawtext, validatehash = self._processflagswrite(text, flags, + sidedata=sidedata) # If the flag processor modifies the revision data, ignore any provided # cachedelta. diff --git a/hgext/remotefilelog/remotefilelog.py b/hgext/remotefilelog/remotefilelog.py --- a/hgext/remotefilelog/remotefilelog.py +++ b/hgext/remotefilelog/remotefilelog.py @@ -135,7 +135,8 @@ node = storageutil.hashrevisionsha1(text, p1, p2) meta, metaoffset = storageutil.parsemeta(text) - rawtext, validatehash = self._processflagswrite(text, flags) + rawtext, validatehash = self._processflagswrite(text, flags, + sidedata=sidedata) return self.addrawrevision(rawtext, transaction, linknode, p1, p2, node, flags, cachedelta, _metatuple=(meta, metaoffset))