# HG changeset patch # User Pierre-Yves David # Date 2021-05-03 10:28:05 # Node ID 2bd4b5218918c83cc97d85b722929e364f560e19 # Parent 042388bba644d1a069ba9b1df736adbf62112c21 revlog: pass a transaction object to `rewrite_sidedata` The `_writing` context need one, so we update the function signature before considering using `_writing` in rewrite_sidedata. Differential Revision: https://phab.mercurial-scm.org/D10607 diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py --- a/mercurial/changegroup.py +++ b/mercurial/changegroup.py @@ -449,11 +449,13 @@ class cg1unpacker(object): if sidedata_helpers: if revlog_constants.KIND_CHANGELOG in sidedata_helpers[1]: - cl.rewrite_sidedata(sidedata_helpers, clstart, clend - 1) + cl.rewrite_sidedata( + trp, sidedata_helpers, clstart, clend - 1 + ) for mf, (startrev, endrev) in touched_manifests.items(): - mf.rewrite_sidedata(sidedata_helpers, startrev, endrev) + mf.rewrite_sidedata(trp, sidedata_helpers, startrev, endrev) for fl, (startrev, endrev) in touched_filelogs.items(): - fl.rewrite_sidedata(sidedata_helpers, startrev, endrev) + fl.rewrite_sidedata(trp, sidedata_helpers, startrev, endrev) # making sure the value exists tr.changes.setdefault(b'changegroup-count-changesets', 0) diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -3120,7 +3120,7 @@ class revlog(object): return d - def rewrite_sidedata(self, helpers, startrev, endrev): + def rewrite_sidedata(self, transaction, helpers, startrev, endrev): if not self.hassidedata: return # inline are not yet supported because they suffer from an issue when