Mercurial > evolve
changeset 3155:b237c1c6dc19
evolve: rename --phasedivergent flag to --phase-divergent
This makes the whole things easier to read.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 26 Oct 2017 09:03:48 +0200 |
| parents | 406992d0d611 |
| children | 31493a1b0e39 |
| files | CHANGELOG hgext3rd/evolve/__init__.py tests/test-evolve-bumped.t tests/test-evolve.t tests/test-stabilize-result.t |
| diffstat | 5 files changed, 19 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Thu Oct 26 09:02:25 2017 +0200 +++ b/CHANGELOG Thu Oct 26 09:03:48 2017 +0200 @@ -8,6 +8,7 @@ * drop support for old and deprecated method to exchange obsmarkers, * forbid usage of the old pushbey based protocol to exchange obsmarkers, * evolve: rename '--contentdivergent' flag to '--content-divergent' + * evolve: rename '--phasedivergent' flag to '--phase-divergent' 6.8.0 -- 2017-10-23 -------------------
--- a/hgext3rd/evolve/__init__.py Thu Oct 26 09:02:25 2017 +0200 +++ b/hgext3rd/evolve/__init__.py Thu Oct 26 09:03:48 2017 +0200 @@ -1060,24 +1060,24 @@ } hintmap = { - 'phasedivergent': _("do you want to use --phasedivergent"), + 'phasedivergent': _("do you want to use --phase-divergent"), 'phasedivergent+contentdivergent': _("do you want to use " - "--phasedivergent or" + "--phase-divergent or" " --content-divergent"), - 'phasedivergent+orphan': _("do you want to use --phasedivergent" + 'phasedivergent+orphan': _("do you want to use --phase-divergent" " or --orphan"), 'contentdivergent': _("do you want to use --content-divergent"), 'contentdivergent+orphan': _("do you want to use --content-divergent" " or --orphan"), 'orphan': _("do you want to use --orphan"), 'any+phasedivergent': _("do you want to use --any (or --rev) and" - " --phasedivergent"), + " --phase-divergent"), 'any+phasedivergent+contentdivergent': _("do you want to use --any" " (or --rev) and" - " --phasedivergent or" + " --phase-divergent or" " --content-divergent"), 'any+phasedivergent+orphan': _("do you want to use --any (or --rev)" - " and --phasedivergent or --orphan"), + " and --phase-divergent or --orphan"), 'any+contentdivergent': _("do you want to use --any (or --rev) and" " --content-divergent"), 'any+contentdivergent+orphan': _("do you want to use --any (or --rev)" @@ -1418,7 +1418,7 @@ 'directory')), ('r', 'rev', [], _('solves troubles of these revisions')), ('', 'bumped', False, _('solves only bumped changesets')), - ('', 'phasedivergent', False, _('solves only phase-divergent changesets')), + ('', 'phase-divergent', False, _('solves only phase-divergent changesets')), ('', 'divergent', False, _('solves only divergent changesets')), ('', 'content-divergent', False, _('solves only content-divergent changesets')), ('', 'unstable', False, _('solves only unstable changesets')), @@ -1527,12 +1527,12 @@ if opts['bumped']: msg = ("'evolve --bumped' is deprecated, " - "use 'evolve --phasedivergent'") + "use 'evolve --phase-divergent'") repo.ui.deprecwarn(msg, '4.4') - opts['phasedivergent'] = opts['bumped'] + opts['phase_divergent'] = opts['bumped'] - troublecategories = ['phasedivergent', 'content_divergent', 'orphan'] + troublecategories = ['phase_divergent', 'content_divergent', 'orphan'] specifiedcategories = [t.replace('_', '') for t in troublecategories if opts[t]]
--- a/tests/test-evolve-bumped.t Thu Oct 26 09:02:25 2017 +0200 +++ b/tests/test-evolve-bumped.t Thu Oct 26 09:03:48 2017 +0200 @@ -70,7 +70,7 @@ no changes found 1 new phase-divergent changesets - $ hg evolve -a -A --phasedivergent + $ hg evolve -a -A --phase-divergent recreate:[2] tweak a atop:[1] modify a computing new diff @@ -122,5 +122,5 @@ | o 0:d3873e73d99e@default(public) init - $ hg evolve --all --phasedivergent + $ hg evolve --all --phase-divergent skipping b28e84916d8c : we do not handle merge yet
--- a/tests/test-evolve.t Thu Oct 26 09:02:25 2017 +0200 +++ b/tests/test-evolve.t Thu Oct 26 09:03:48 2017 +0200 @@ -406,7 +406,7 @@ | o 0:e55e0562ee93@default(public) base - $ hg evolve --any --traceback --phasedivergent + $ hg evolve --any --traceback --phase-divergent recreate:[6] another feature that rox atop:[5] another feature (child of ba0ec09b1bab) computing new diff @@ -1058,7 +1058,7 @@ |/ o 0 : a0 - test - $ hg evolve -r "desc('add new file bumped')" --phasedivergent + $ hg evolve -r "desc('add new file bumped')" --phase-divergent recreate:[11] add new file bumped atop:[10] a2 computing new diff @@ -1131,7 +1131,7 @@ set of specified revisions is empty [1] - $ hg evolve --rev "cce26b684bfe::" --phasedivergent + $ hg evolve --rev "cce26b684bfe::" --phase-divergent no phasedivergent changesets in specified revisions (do you want to use --orphan) [2]
--- a/tests/test-stabilize-result.t Thu Oct 26 09:02:25 2017 +0200 +++ b/tests/test-stabilize-result.t Thu Oct 26 09:03:48 2017 +0200 @@ -153,20 +153,20 @@ Stabilize! - $ hg evolve --any --dry-run --phasedivergent + $ hg evolve --any --dry-run --phase-divergent recreate:[9] newer a atop:[6] newer a hg rebase --rev d5c7ef82d003 --dest 66719795a494; hg update 1cf0aacfd363; hg revert --all --rev d5c7ef82d003; hg commit --msg "bumped update to %s" (no-eol) - $ hg evolve --any --confirm --phasedivergent + $ hg evolve --any --confirm --phase-divergent recreate:[9] newer a atop:[6] newer a perform evolve? [Ny] n abort: evolve aborted by user [255] - $ echo y | hg evolve --any --confirm --config ui.interactive=True --phasedivergent + $ echo y | hg evolve --any --confirm --config ui.interactive=True --phase-divergent recreate:[9] newer a atop:[6] newer a perform evolve? [Ny] y