This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1864

repair: drop unnecessary phase cache invalidation
ClosedPublic

Authored by martinvonz on Jan 16 2018, 2:33 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG5748f404dad3: repair: drop unnecessary phase cache invalidation
Summary

After stripping the revlogs, we have been invalidating the phase cache
since bf7b8157c483. Later, in 8e3021fd1a44, I added a call to
phasecache.filterunknown(). I apparently didn't realize it then, but I
now think that that call made the existing phasecache.invalidate()
call unnecessary, so this patch drops it. Both the test added in
bf7b8157c483 and the entire evolve extension test suite indeed still
pass.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jan 16 2018, 2:33 AM
yuja accepted this revision.Jan 18 2018, 8:14 AM
This revision is now accepted and ready to land.Jan 18 2018, 8:14 AM
Closed by commit rHG5748f404dad3: repair: drop unnecessary phase cache invalidation (authored by martinvonz). · Explain WhyJan 18 2018, 8:41 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/repair.py (2 lines)

Diff 4839

mercurial/repair.py

if not isinstance(gen, bundle2.unbundle20): if not isinstance(gen, bundle2.unbundle20):
txnname = "strip\n%s" % util.hidepassword(tmpbundleurl) txnname = "strip\n%s" % util.hidepassword(tmpbundleurl)
with repo.transaction(txnname) as tr: with repo.transaction(txnname) as tr:
bundle2.applybundle(repo, gen, tr, source='strip', bundle2.applybundle(repo, gen, tr, source='strip',
url=tmpbundleurl) url=tmpbundleurl)
if not repo.ui.verbose: if not repo.ui.verbose:
repo.ui.popbuffer() repo.ui.popbuffer()
f.close() f.close()
repo._phasecache.invalidate()
with repo.transaction('repair') as tr: with repo.transaction('repair') as tr:
bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm] bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm]
bm.applychanges(repo, tr, bmchanges) bm.applychanges(repo, tr, bmchanges)
# remove undo files # remove undo files
for undovfs, undofile in repo.undofiles(): for undovfs, undofile in repo.undofiles():
try: try: