This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3213

fix: add --all flag to fix non-public non-obsolete revisions
ClosedPublic

Authored by hooper on Apr 9 2018, 7:11 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe2506748b47f: fix: add --all flag to fix non-public non-obsolete revisions

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

hooper created this revision.Apr 9 2018, 7:11 PM
indygreg accepted this revision.Apr 12 2018, 11:56 AM
indygreg added a subscriber: indygreg.

Nice feature!

tests/test-fix-topology.t
264–290

Next time, please consider using the drawdag extension for building a repo. It can't create obsolete changesets. But if the test is doing a bunch of regular hg commit, it will be faster to use drawdag to create the repo, as it avoids a ton of overhead from hg processes.

(I'm still guilty of not using drawdag, as the tool is relatively new.)

This revision is now accepted and ready to land.Apr 12 2018, 11:56 AM
Closed by commit rHGe2506748b47f: fix: add --all flag to fix non-public non-obsolete revisions (authored by hooper). · Explain WhyApr 12 2018, 11:57 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 7925

hgext/fix.py

configitem('fix', '.*(:%s)?' % key, default=None, generic=True) configitem('fix', '.*(:%s)?' % key, default=None, generic=True)
# A good default size allows most source code files to be fixed, but avoids # A good default size allows most source code files to be fixed, but avoids
# letting fixer tools choke on huge inputs, which could be surprising to the # letting fixer tools choke on huge inputs, which could be surprising to the
# user. # user.
configitem('fix', 'maxfilesize', default='2MB') configitem('fix', 'maxfilesize', default='2MB')
@command('fix', @command('fix',
[('', 'base', [], _('revisions to diff against (overrides automatic ' [('', 'all', False, _('fix all non-public non-obsolete revisions')),
('', 'base', [], _('revisions to diff against (overrides automatic '
'selection, and applies to every revision being ' 'selection, and applies to every revision being '
'fixed)'), _('REV')), 'fixed)'), _('REV')),
('r', 'rev', [], _('revisions to fix'), _('REV')), ('r', 'rev', [], _('revisions to fix'), _('REV')),
('w', 'working-dir', False, _('fix the working directory')), ('w', 'working-dir', False, _('fix the working directory')),
('', 'whole', False, _('always fix every line of a file'))], ('', 'whole', False, _('always fix every line of a file'))],
_('[OPTION]... [FILE]...')) _('[OPTION]... [FILE]...'))
def fix(ui, repo, *pats, **opts): def fix(ui, repo, *pats, **opts):
"""rewrite file content in changesets or working directory """rewrite file content in changesets or working directory
will be fixed. If the checked-out revision is also fixed, the working will be fixed. If the checked-out revision is also fixed, the working
directory will update to the replacement revision. directory will update to the replacement revision.
When determining what lines of each file to fix at each revision, the whole When determining what lines of each file to fix at each revision, the whole
set of revisions being fixed is considered, so that fixes to earlier set of revisions being fixed is considered, so that fixes to earlier
revisions are not forgotten in later ones. The --base flag can be used to revisions are not forgotten in later ones. The --base flag can be used to
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.
""" """
if opts['all']:
if opts['rev']:
raise error.Abort(_('cannot specify both "--rev" and "--all"'))
opts['rev'] = ['not public() and not obsolete()']
opts['working_dir'] = True
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
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)

tests/test-fix-topology.t

GGGG GGGG
HHHH HHHH
KKKK KKKK
Change A was never a baserev because none of its children were to be fixed. Change A was never a baserev because none of its children were to be fixed.
$ cd .. $ cd ..
The --all flag should fix anything that wouldn't cause a problem if you fixed
it, including the working copy. Obsolete revisions are not fixed because that
could cause divergence. Public revisions would cause an abort because they are
immutable. We can fix orphans because their successors are still just orphans
of the original obsolete parent. When obsolesence is off, we're just fixing and
replacing anything that isn't public.
$ hg init fixall
$ cd fixall
#if obsstore-on
$ printf "one\n" > foo.whole
$ hg commit -Aqm "first"
$ hg phase --public
$ hg tag --local root
$ printf "two\n" > foo.whole
$ hg commit -m "second"
$ printf "three\n" > foo.whole
$ hg commit -m "third" --secret
$ hg tag --local secret
$ hg checkout root
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ printf "four\n" > foo.whole
$ hg commit -m "fourth"
created new head
$ printf "five\n" > foo.whole
$ hg commit -m "fifth"
$ hg tag --local replaced
$ printf "six\n" > foo.whole
$ hg commit -m "sixth"
$ hg checkout replaced
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ printf "seven\n" > foo.whole
$ hg commit --amend
1 new orphan changesets
$ hg checkout secret
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ printf "uncommitted\n" > foo.whole
indygregUnsubmitted
Not Done

Next time, please consider using the drawdag extension for building a repo. It can't create obsolete changesets. But if the test is doing a bunch of regular hg commit, it will be faster to use drawdag to create the repo, as it avoids a ton of overhead from hg processes.

(I'm still guilty of not using drawdag, as the tool is relatively new.)

indygreg: Next time, please consider using the `drawdag` extension for building a repo. It can't create…
$ hg log --graph --template '{rev} {desc} {phase}\n'
o 6 fifth draft
|
| * 5 sixth draft
| |
| x 4 fifth draft
|/
o 3 fourth draft
|
| @ 2 third secret
| |
| o 1 second draft
|/
o 0 first public
$ hg fix --all
1 new orphan changesets
$ hg log --graph --template '{rev} {desc}\n' -r 'sort(all(), topo)' --hidden
o 11 fifth
|
o 9 fourth
|
| @ 8 third
| |
| o 7 second
|/
| * 10 sixth
| |
| | x 5 sixth
| |/
| x 4 fifth
| |
| | x 6 fifth
| |/
| x 3 fourth
|/
| x 2 third
| |
| x 1 second
|/
o 0 first
$ hg cat -r 7 foo.whole
TWO
$ hg cat -r 8 foo.whole
THREE
$ hg cat -r 9 foo.whole
FOUR
$ hg cat -r 10 foo.whole
SIX
$ hg cat -r 11 foo.whole
SEVEN
$ cat foo.whole
UNCOMMITTED
#else
$ printf "one\n" > foo.whole
$ hg commit -Aqm "first"
$ hg phase --public
$ hg tag --local root
$ printf "two\n" > foo.whole
$ hg commit -m "second"
$ printf "three\n" > foo.whole
$ hg commit -m "third" --secret
$ hg tag --local secret
$ hg checkout root
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ printf "four\n" > foo.whole
$ hg commit -m "fourth"
created new head
$ printf "uncommitted\n" > foo.whole
$ hg log --graph --template '{rev} {desc} {phase}\n'
@ 3 fourth draft
|
| o 2 third secret
| |
| o 1 second draft
|/
o 0 first public
$ hg fix --all
saved backup bundle to * (glob)
$ hg log --graph --template '{rev} {desc} {phase}\n'
@ 3 fourth draft
|
| o 2 third secret
| |
| o 1 second draft
|/
o 0 first public
$ hg cat -r 0 foo.whole
one
$ hg cat -r 1 foo.whole
TWO
$ hg cat -r 2 foo.whole
THREE
$ hg cat -r 3 foo.whole
FOUR
$ cat foo.whole
UNCOMMITTED
#endif
$ cd ..

tests/test-fix.t

revisions are not forgotten in later ones. The --base flag can be used to revisions are not forgotten in later ones. The --base flag can be used to
override this default behavior, though it is not usually desirable to do override this default behavior, though it is not usually desirable to do
so. so.
(use 'hg help -e fix' to show help for the fix extension) (use 'hg help -e fix' to show help for the fix extension)
options ([+] can be repeated): options ([+] can be repeated):
--all fix all non-public non-obsolete revisions
--base REV [+] revisions to diff against (overrides automatic selection, --base REV [+] revisions to diff against (overrides automatic selection,
and applies to every revision being fixed) and applies to every revision being fixed)
-r --rev REV [+] revisions to fix -r --rev REV [+] revisions to fix
-w --working-dir fix the working directory -w --working-dir fix the working directory
--whole always fix every line of a file --whole always fix every line of a file
(some details hidden, use --verbose to show complete help) (some details hidden, use --verbose to show complete help)