This is an archive of the discontinued Mercurial Phabricator instance.

Differential D394

fold: invalidate false cache
AbandonedPublic

Authored by felixmerk on Aug 14 2017, 8:11 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Summary

hg fold left mercurial with the wrong cache state at the end of running, which
means if we ran something within the same process we could run into issues.
This bug affected hg undo, which is why the tests specifically check for their
interaction.

Test Plan

unit tests

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

felixmerk created this revision.Aug 14 2017, 8:11 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 14 2017, 8:11 PM
quark accepted this revision.Aug 14 2017, 9:09 PM
quark added a subscriber: quark.

Nice! Upon further investigation I suspect other commands have a similar issue. It seems localrepo.transaction may be responsible for that.

This revision is now accepted and ready to land.Aug 14 2017, 9:09 PM
quark added a comment.Aug 14 2017, 9:25 PM

Actually it's more complex than that - For example, update might affect visibility but it does not even use a transaction. So I think we have to invalidate these cache in undo code.

felixmerk abandoned this revision.Aug 14 2017, 9:49 PM

This solution doesn't handle the general case.

Revision Contents
Changeset List

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

Diff 898

hgext3rd/fbamend/fold.py

ui.status(_('%i changesets folded\n') % len(revs)) ui.status(_('%i changesets folded\n') % len(revs))
if repo['.'].rev() in revs: if repo['.'].rev() in revs:
hg.update(repo, newid) hg.update(repo, newid)
if torebase: if torebase:
folded = repo.revs('allsuccessors(%ld)', revs).last() folded = repo.revs('allsuccessors(%ld)', revs).last()
common.restackonce(ui, repo, folded) common.restackonce(ui, repo, folded)
# volatile sets are invalid after fold
repo.invalidatevolatilesets()
tr.close() tr.close()
finally: finally:
tr.release() tr.release()
finally: finally:
lockmod.release(lock, wlock) lockmod.release(lock, wlock)
def _foldcheck(repo, revs): def _foldcheck(repo, revs):
roots = repo.revs('roots(%ld)', revs) roots = repo.revs('roots(%ld)', revs)

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