This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1933

repair: invalidate volatile sets after stripping
ClosedPublic

Authored by martinvonz on Jan 21 2018, 1:41 PM.

Details

Reviewers
durin42
yuja
Group Reviewers
hg-reviewers
Commits
rHG128dd940bedc: repair: invalidate volatile sets after stripping
Summary

Matt Harbison reported that some tests were broken on Windows after
1a09dad8b85a (evolution: report new unstable changesets,
2018-01-14). The failures were exactly as seen in this patch. The
failures actually seemed correct, which made me wonder why they didn't
fail the same way on Linux. It turned out to be a cache invalidation
problem.

The new orphan mentioned in the test case actually does get created
when we're re-applying the temporary bundle that's created while
stripping. However, without the invalidation, it appears that there
was already an orphan before applying the temporary bundle.

The warnings about unknown working parent appear because the
aformentioned changeset means that we're now accessing the dirstate
while it's invalid.

We may want to suppress these messages that happen in the intermediate
strip state, but they're technically correct (although confusing to
the user), so I think just fixing the cache invalidation is fine for
now.

I haven't figured out why the caches seemed to get correctly
invalidated on Windows.

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

martinvonz created this revision.Jan 21 2018, 1:41 PM
quark added a subscriber: quark.Jan 21 2018, 5:06 PM

I haven't figured out why the caches seemed to get correctly invalidated on Windows.

I guess it's because filecache is a no-op on Windows. So things like repo._filecache[x].refresh() is doing nothing.

mharbison72 added a subscriber: mharbison72.Jan 21 2018, 5:07 PM

That worked for me, thanks.

FWIW, a couple of years ago, there were test failures in evolve on Windows that was fixed by adding a repo.invalidate() in bookmarks.py. I can't find the thread now, and that fix wasn't taken. So Windows may not be getting it all correct either. That said, I just ran the evolve tests, and it seems to have disappeared. (Though I haven't figured out how to run the tests on the repo reliably since it started supporting enabling with evolve=. It seems to want to use the pip installed code.) There are now missing orphan messages similar to above, but these have 'remote:' prefixes, so it's probably an issue of not being flushed, rather than an actual problem.

If you need to throw patches at me to trace through the Windows code to see what's different, feel free.

yuja accepted this revision.Jan 22 2018, 7:45 AM
This revision is now accepted and ready to land.Jan 22 2018, 7:45 AM
Closed by commit rHG128dd940bedc: repair: invalidate volatile sets after stripping (authored by martinvonz). · Explain WhyJan 22 2018, 8:00 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 4977

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.invalidatevolatilesets()
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

tests/test-histedit-obsolete.t

[1] [1]
$ hg st $ hg st
A b A b
A d A d
? plan ? plan
$ hg commit --amend -X . -m XXXXXX $ hg commit --amend -X . -m XXXXXX
$ hg commit --amend -X . -m b2 $ hg commit --amend -X . -m b2
$ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup $ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup
warning: ignoring unknown working parent aba7da937030!
$ hg histedit --continue $ hg histedit --continue
$ hg log -G $ hg log -G
@ 8:273c1f3b8626 c @ 8:273c1f3b8626 c
| |
o 7:aba7da937030 b2 o 7:aba7da937030 b2
| |
o 0:cb9a9f314b8b a o 0:cb9a9f314b8b a

tests/test-rebase-obsolete.t

(hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290) (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo D > D $ echo D > D
$ hg add D $ hg add D
$ hg commit -m D $ hg commit -m D
1 new orphan changesets 1 new orphan changesets
$ hg --hidden strip -r 'desc(B1)' $ hg --hidden strip -r 'desc(B1)'
saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg
1 new orphan changesets
$ hg log -G $ hg log -G
@ 5:1a79b7535141 D @ 5:1a79b7535141 D
| |
| o 4:ff2c4d47b71d C | o 4:ff2c4d47b71d C
| | | |
| o 2:261e70097290 B2 | o 2:261e70097290 B2
| | | |
x | 1:a8b11f55fb19 B0 (rewritten using amend as 2:261e70097290) x | 1:a8b11f55fb19 B0 (rewritten using amend as 2:261e70097290)

tests/test-single-head.t

date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
actual stripping actual stripping
$ hg strip --config extensions.strip= --rev 'desc("c_dH0")' $ hg strip --config extensions.strip= --rev 'desc("c_dH0")'
saved backup bundle to $TESTTMP/client/.hg/strip-backup/fe47ea669cea-a41bf5a9-backup.hg saved backup bundle to $TESTTMP/client/.hg/strip-backup/fe47ea669cea-a41bf5a9-backup.hg
warning: ignoring unknown working parent 49003e504178!