This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10607

revlog: pass a transaction object to `rewrite_sidedata`
ClosedPublic

Authored by marmoute on May 3 2021, 7:52 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG2bd4b5218918: revlog: pass a transaction object to `rewrite_sidedata`
Summary

The _writing context need one, so we update the function signature before considering using _writing in rewrite_sidedata.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.May 3 2021, 7:52 AM
baymax updated this revision to Diff 27522.May 3 2021, 9:44 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27853.May 11 2021, 1:42 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27979.May 17 2021, 7:02 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG2bd4b5218918: revlog: pass a transaction object to `rewrite_sidedata`.May 17 2021, 8:56 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG2bd4b5218918: revlog: pass a transaction object to `rewrite_sidedata` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (8 lines)
Mmercurial/revlog.py (2 lines)

Diff 28007

mercurial/changegroup.py

trp, trp,
efiles, efiles,
needfiles, needfiles,
addrevisioncb=on_filelog_rev, addrevisioncb=on_filelog_rev,
) )
if sidedata_helpers: if sidedata_helpers:
if revlog_constants.KIND_CHANGELOG in sidedata_helpers[1]: 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(): 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(): 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 # making sure the value exists
tr.changes.setdefault(b'changegroup-count-changesets', 0) tr.changes.setdefault(b'changegroup-count-changesets', 0)
tr.changes.setdefault(b'changegroup-count-revisions', 0) tr.changes.setdefault(b'changegroup-count-revisions', 0)
tr.changes.setdefault(b'changegroup-count-files', 0) tr.changes.setdefault(b'changegroup-count-files', 0)
tr.changes.setdefault(b'changegroup-count-heads', 0) tr.changes.setdefault(b'changegroup-count-heads', 0)
# some code use bundle operation for internal purpose. They usually # some code use bundle operation for internal purpose. They usually

mercurial/revlog.py

if storedsize: if storedsize:
d[b'storedsize'] = sum( d[b'storedsize'] = sum(
self.opener.stat(path).st_size for path in self.files() self.opener.stat(path).st_size for path in self.files()
) )
return d return d
def rewrite_sidedata(self, helpers, startrev, endrev): def rewrite_sidedata(self, transaction, helpers, startrev, endrev):
if not self.hassidedata: if not self.hassidedata:
return return
# inline are not yet supported because they suffer from an issue when # inline are not yet supported because they suffer from an issue when
# rewriting them (since it's not an append-only operation). # rewriting them (since it's not an append-only operation).
# See issue6485. # See issue6485.
assert not self._inline assert not self._inline
if not helpers[1] and not helpers[2]: if not helpers[1] and not helpers[2]:
# Nothing to generate or remove # Nothing to generate or remove