This is an archive of the discontinued Mercurial Phabricator instance.

Differential D395

undo: invalidate false cache
ClosedPublic

Authored by felixmerk on Aug 14 2017, 9:51 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX8143cb50d4e7: undo: invalidate false cache
Summary

Mercurial sometimes leaves bad caches. Easiest example is when updating to a
hidden commit, where hg undo will fail, but can be reproduced with many commands
(such as fold which is used for testing here).

Test Plan

unit tests

Diff Detail

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

Event Timeline

felixmerk created this revision.Aug 14 2017, 9:51 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 14 2017, 9:51 PM
quark accepted this revision.Aug 15 2017, 2:25 PM
This revision is now accepted and ready to land.Aug 15 2017, 2:25 PM
Closed by commit rFBHGX8143cb50d4e7: undo: invalidate false cache (authored by felixmerk). · Explain WhyAug 16 2017, 11:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/undo.py (5 lines)
AMtests/test-fold-undo.t (81 lines)

Diff 995

hgext3rd/undo.py

if '_undologactive' not in os.environ: if '_undologactive' not in os.environ:
os.environ['_undologactive'] = "active" os.environ['_undologactive'] = "active"
rootlog = True rootlog = True
else: else:
rootlog = False rootlog = False
result = orig(lui, repo, cmd, fullargs, *args) result = orig(lui, repo, cmd, fullargs, *args)
# mercurial is bad with caches
# eg update to hidden commit will leave false cache
if repo:
repo.invalidatevolatilesets()
# record changes to repo # record changes to repo
if rootlog: if rootlog:
safelog(repo, command) safelog(repo, command)
del os.environ['_undologactive'] del os.environ['_undologactive']
return result return result
# Write: Log control # Write: Log control

tests/test-fold-undo.t

  • This file was added.
Set up test environment.
This test confirms cacheinvalidation in hg fold.
$ cat >> $HGRCPATH << EOF
> [extensions]
> fbamend=$TESTDIR/../hgext3rd/fbamend
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
> undo=$TESTDIR/../hgext3rd/undo.py
> rebase=
> [experimental]
> evolution = createmarkers, allowunstable
> EOF
$ showgraph() {
> hg log --graph -T "{rev} {desc|firstline}" | sed \$d
> }
$ reset() {
> cd ..
> rm -rf repo
> hg init repo
> cd repo
> }
Set up repo.
$ hg init repo && cd repo
$ hg debugbuilddag -m "+5 *4 +2"
$ showgraph
o 7 r7
|
o 6 r6
|
o 5 r5
|
| o 4 r4
| |
| o 3 r3
| |
| o 2 r2
|/
o 1 r1
|
o 0 r0
$ hg up 7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Do a fold
$ hg fold --exact 7 6
2 changesets folded
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ showgraph
@ 8 r7
|
o 5 r5
|
| o 4 r4
| |
| o 3 r3
| |
| o 2 r2
|/
o 1 r1
|
o 0 r0
Do an undo
$ hg undo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ showgraph
@ 7 r7
|
o 6 r6
|
o 5 r5
|
| o 4 r4
| |
| o 3 r3
| |
| o 2 r2
|/
o 1 r1
|
o 0 r0