This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3847

fix: disallow 'hg fix --base <rev> --whole'
ClosedPublic

Authored by hooper on Jun 26 2018, 9:07 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG3a2c57dfea60: fix: disallow 'hg fix --base <rev> --whole'
Summary

The two flags have conflicting meaning, so we shouldn't pretend to honor both
(otherwise, --whole takes precedence in the current implementation).

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

hooper created this revision.Jun 26 2018, 9:07 PM
durin42 accepted this revision as: durin42.Jun 29 2018, 9:10 PM
hooper added a comment.Jul 3 2018, 7:57 PM

Let's not commit this one if possible. I have another patch with a test case that shows the combination is useful.

Closed by commit rHG3a2c57dfea60: fix: disallow 'hg fix --base <rev> --whole' (authored by hooper). · Explain WhyJul 4 2018, 8:04 AM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Jul 4 2018, 8:36 AM
Let's not commit this one if possible. I have another patch with a test

case that shows the combination is useful.

Oops. Pruned from the hg-committed repository. Next time, can you exclude
this kind of patches from the series somehow?

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (2 lines)
Mtests/test-fix.t (3 lines)

Diff 9431

hgext/fix.py

"""Returns a map of the base contexts for each revision """Returns a map of the base contexts for each revision
The base contexts determine which lines are considered modified when we The base contexts determine which lines are considered modified when we
attempt to fix just the modified lines in a file. attempt to fix just the modified lines in a file.
""" """
# The --base flag overrides the usual logic, and we give every revision # The --base flag overrides the usual logic, and we give every revision
# exactly the set of baserevs that the user specified. # exactly the set of baserevs that the user specified.
if opts.get('base'): if opts.get('base'):
if opts.get('whole'):
raise error.Abort('--base has no meaning in addition to --whole')
baserevs = set(scmutil.revrange(repo, opts.get('base'))) baserevs = set(scmutil.revrange(repo, opts.get('base')))
if not baserevs: if not baserevs:
baserevs = {nullrev} baserevs = {nullrev}
basectxs = {repo[rev] for rev in baserevs} basectxs = {repo[rev] for rev in baserevs}
return {rev: basectxs for rev in revstofix} return {rev: basectxs for rev in revstofix}
# Proceed in topological order so that we can easily determine each # Proceed in topological order so that we can easily determine each
# revision's baserevs by looking at its parents and their baserevs. # revision's baserevs by looking at its parents and their baserevs.

tests/test-fix.t

$ hg fix --whole $ hg fix --whole
abort: no changesets specified abort: no changesets specified
(use --rev or --working-dir) (use --rev or --working-dir)
[255] [255]
$ hg fix --base 0 $ hg fix --base 0
abort: no changesets specified abort: no changesets specified
(use --rev or --working-dir) (use --rev or --working-dir)
[255] [255]
$ hg fix --base 0 --whole --working-dir
abort: --base has no meaning in addition to --whole
[255]
Fixing a public revision isn't allowed. It should abort early enough that Fixing a public revision isn't allowed. It should abort early enough that
nothing happens, even to the working directory. nothing happens, even to the working directory.
$ printf "hello\n" > hello.whole $ printf "hello\n" > hello.whole
$ hg commit -Aqm "hello" $ hg commit -Aqm "hello"
$ hg phase -r 0 --public $ hg phase -r 0 --public
$ hg fix -r 0 $ hg fix -r 0