This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1865

repair: filter out unknown revisions from phasecache within transaction
ClosedPublic

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

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG54074a82e050: repair: filter out unknown revisions from phasecache within transaction
Summary

I'm about to add another summary report callback that needs to access
phase information. These callbacks run at the end of the transaction
and some of them failed because they tried to get the phase for
stripped commits. The solution is to filter out unknown revisions
before the transaction is closed.

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 rHG54074a82e050: repair: filter out unknown revisions from phasecache within transaction (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 4840

mercurial/repair.py

file, troffset, ignore = tr.entries[i] file, troffset, ignore = tr.entries[i]
with repo.svfs(file, 'a', checkambig=True) as fp: with repo.svfs(file, 'a', checkambig=True) as fp:
fp.truncate(troffset) fp.truncate(troffset)
if troffset == 0: if troffset == 0:
repo.store.markremoved(file) repo.store.markremoved(file)
deleteobsmarkers(repo.obsstore, stripobsidx) deleteobsmarkers(repo.obsstore, stripobsidx)
del repo.obsstore del repo.obsstore
repo._phasecache.filterunknown(repo) repo._phasecache.filterunknown(repo)
if tmpbundlefile: if tmpbundlefile:
ui.note(_("adding branch\n")) ui.note(_("adding branch\n"))
f = vfs.open(tmpbundlefile, "rb") f = vfs.open(tmpbundlefile, "rb")
gen = exchange.readbundle(ui, f, tmpbundlefile, vfs) gen = exchange.readbundle(ui, f, tmpbundlefile, vfs)
if not repo.ui.verbose: if not repo.ui.verbose:
# silence internal shuffling chatter # silence internal shuffling chatter
repo.ui.pushbuffer() repo.ui.pushbuffer()
tmpbundleurl = 'bundle:' + vfs.join(tmpbundlefile) tmpbundleurl = 'bundle:' + vfs.join(tmpbundlefile)