This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3823

fix: include cleanupnodes() in transaction
ClosedPublic

Authored by martinvonz on Jun 20 2018, 12:29 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc1f4364f9336: fix: include cleanupnodes() in transaction
Summary

As pointed out by Yuya, we need a transaction to make sure the state
before the call to cleanupnodes() is not observable.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (2 lines)
Mtests/test-fix-topology.t (1 line)

Diff 9239

hgext/fix.py

override this default behavior, though it is not usually desirable to do so. override this default behavior, though it is not usually desirable to do so.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if opts['all']: if opts['all']:
if opts['rev']: if opts['rev']:
raise error.Abort(_('cannot specify both "--rev" and "--all"')) raise error.Abort(_('cannot specify both "--rev" and "--all"'))
opts['rev'] = ['not public() and not obsolete()'] opts['rev'] = ['not public() and not obsolete()']
opts['working_dir'] = True opts['working_dir'] = True
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock(), repo.transaction('fix'):
revstofix = getrevstofix(ui, repo, opts) revstofix = getrevstofix(ui, repo, opts)
basectxs = getbasectxs(repo, opts, revstofix) basectxs = getbasectxs(repo, opts, revstofix)
workqueue, numitems = getworkqueue(ui, repo, pats, opts, revstofix, workqueue, numitems = getworkqueue(ui, repo, pats, opts, revstofix,
basectxs) basectxs)
filedata = collections.defaultdict(dict) filedata = collections.defaultdict(dict)
replacements = {} replacements = {}
fixers = getfixers(ui) fixers = getfixers(ui)
# Some day this loop can become a worker pool, but for now it's easier # Some day this loop can become a worker pool, but for now it's easier

tests/test-fix-topology.t

| @ 2 third secret | @ 2 third secret
| | | |
| o 1 second draft | o 1 second draft
|/ |/
o 0 first public o 0 first public
$ hg fix --all $ hg fix --all
1 new orphan changesets
$ hg log --graph --template '{rev} {desc}\n' -r 'sort(all(), topo)' --hidden $ hg log --graph --template '{rev} {desc}\n' -r 'sort(all(), topo)' --hidden
o 11 fifth o 11 fifth
| |
o 9 fourth o 9 fourth
| |
| @ 8 third | @ 8 third
| | | |