diff --git a/hgext/remotefilelog/remotefilelog.py b/hgext/remotefilelog/remotefilelog.py index bd5858c28bbe9840ac9d27d39e298d0457276d9f_aGdleHQvcmVtb3RlZmlsZWxvZy9yZW1vdGVmaWxlbG9nLnB5..33532939c667d450ca5637daeeca9d02889b17c8_aGdleHQvcmVtb3RlZmlsZWxvZy9yZW1vdGVmaWxlbG9nLnB5 100644 --- a/hgext/remotefilelog/remotefilelog.py +++ b/hgext/remotefilelog/remotefilelog.py @@ -129,7 +129,8 @@ 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) @@ -133,6 +134,8 @@ # 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) diff --git a/mercurial/revlog.py b/mercurial/revlog.py index bd5858c28bbe9840ac9d27d39e298d0457276d9f_bWVyY3VyaWFsL3JldmxvZy5weQ==..33532939c667d450ca5637daeeca9d02889b17c8_bWVyY3VyaWFsL3JldmxvZy5weQ== 100644 --- 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)