Mercurial > hg > evolve
changeset 3259:406992d0d611
evolve: rename --contentdivergent flag to --content-divergent
This makes the whole things easier to read.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 26 Oct 2017 09:02:25 +0200 |
| parents | 544354cfc626 |
| children | b237c1c6dc19 |
| files | CHANGELOG hgext3rd/evolve/__init__.py tests/test-divergent.t tests/test-evolve-obshistory.t tests/test-evolve-templates.t tests/test-obsolete.t tests/test-sharing.t tests/test-stabilize-result.t tests/test-uncommit.t |
| diffstat | 9 files changed, 29 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ * drop compatibility with Mercurial 3.8, 3.9 and 4.0, * 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' 6.8.0 -- 2017-10-23 -------------------
--- a/hgext3rd/evolve/__init__.py +++ b/hgext3rd/evolve/__init__.py @@ -705,7 +705,7 @@ if reason == 'pruned': solvemsg = _("use 'hg evolve' to update to its parent successor") elif reason == 'diverged': - debugcommand = "hg evolve --list --contentdivergent" + debugcommand = "hg evolve --list --content-divergent" basemsg = _("%s has diverged, use '%s' to resolve the issue") solvemsg = basemsg % (shortnode, debugcommand) elif reason == 'superseed': @@ -1063,11 +1063,11 @@ 'phasedivergent': _("do you want to use --phasedivergent"), 'phasedivergent+contentdivergent': _("do you want to use " "--phasedivergent or" - " --contentdivergent"), + " --content-divergent"), 'phasedivergent+orphan': _("do you want to use --phasedivergent" " or --orphan"), - 'contentdivergent': _("do you want to use --contentdivergent"), - 'contentdivergent+orphan': _("do you want to use --contentdivergent" + '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" @@ -1075,13 +1075,13 @@ 'any+phasedivergent+contentdivergent': _("do you want to use --any" " (or --rev) and" " --phasedivergent or" - " --contentdivergent"), + " --content-divergent"), 'any+phasedivergent+orphan': _("do you want to use --any (or --rev)" " and --phasedivergent or --orphan"), 'any+contentdivergent': _("do you want to use --any (or --rev) and" - " --contentdivergent"), + " --content-divergent"), 'any+contentdivergent+orphan': _("do you want to use --any (or --rev)" - " and --contentdivergent or " + " and --content-divergent or " "--orphan"), 'any+orphan': _("do you want to use --any (or --rev)" "and --orphan"), @@ -1420,7 +1420,7 @@ ('', 'bumped', False, _('solves only bumped changesets')), ('', 'phasedivergent', False, _('solves only phase-divergent changesets')), ('', 'divergent', False, _('solves only divergent changesets')), - ('', 'contentdivergent', False, _('solves only content-divergent changesets')), + ('', 'content-divergent', False, _('solves only content-divergent changesets')), ('', 'unstable', False, _('solves only unstable changesets')), ('', 'orphan', False, _('solves only orphan changesets (default)')), ('a', 'all', False, _('evolve all troubled changesets related to the ' @@ -1520,10 +1520,10 @@ if opts['divergent']: msg = ("'evolve --divergent' is deprecated, " - "use 'evolve --contentdivergent'") + "use 'evolve --content-divergent'") repo.ui.deprecwarn(msg, '4.4') - opts['contentdivergent'] = opts['divergent'] + opts['content_divergent'] = opts['divergent'] if opts['bumped']: msg = ("'evolve --bumped' is deprecated, " @@ -1532,8 +1532,10 @@ opts['phasedivergent'] = opts['bumped'] - troublecategories = ['phasedivergent', 'contentdivergent', 'orphan'] - specifiedcategories = [t for t in troublecategories if opts[t]] + troublecategories = ['phasedivergent', 'content_divergent', 'orphan'] + specifiedcategories = [t.replace('_', '') + for t in troublecategories + if opts[t]] if listopt: compat.startpager(ui, 'evolve') listtroubles(ui, repo, specifiedcategories, **opts)
--- a/tests/test-divergent.t +++ b/tests/test-divergent.t @@ -53,7 +53,7 @@ |/ o 0:135f39f4bd78@default(draft) add _a [] - $ hg evolve --all --any --contentdivergent + $ hg evolve --all --any --content-divergent merge:[2] add bdivergent1 with: [3] add bdivergent2 base: [1] add _b @@ -98,7 +98,7 @@ |/ o 0:135f39f4bd78@default(draft) add _a [] - $ hg evolve --all --any --contentdivergent + $ hg evolve --all --any --content-divergent merge:[6] add cdivergent1 with: [7] cdivergent2 base: [5] add _c @@ -146,9 +146,9 @@ > EOF $ hg evolve --all nothing to evolve on current working copy parent - (do you want to use --contentdivergent) + (do you want to use --content-divergent) [2] - $ hg evolve --contentdivergent + $ hg evolve --content-divergent merge:[3] add bdivergent2 with: [2] add bdivergent1 base: [1] add _b
--- a/tests/test-evolve-obshistory.t +++ b/tests/test-evolve-obshistory.t @@ -1287,7 +1287,7 @@ $ hg update --hidden 'desc(A0)' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) - (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) + (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) Test output with amended + folded commit ========================================
--- a/tests/test-evolve-templates.t +++ b/tests/test-evolve-templates.t @@ -659,7 +659,7 @@ $ hg up 'desc(A0)' --hidden 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) - (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) + (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) Precursors template should show current revision as it is the working copy $ hg tlog
--- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -721,7 +721,7 @@ $ hg up --hidden 2 1 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (4538525df7e2) - (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) + (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) $ hg export 9468a5f5d8b2 | hg import - applying patch from stdin 1 new orphan changesets
--- a/tests/test-sharing.t +++ b/tests/test-sharing.t @@ -505,7 +505,7 @@ 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) Use evolve to fix the divergence. - $ HGMERGE=internal:other hg evolve --contentdivergent + $ HGMERGE=internal:other hg evolve --content-divergent merge:[5] fix bug 24 (v2 by bob) with: [6] fix bug 24 (v2 by alice) base: [4] fix bug 24 (v1)
--- a/tests/test-stabilize-result.t +++ b/tests/test-stabilize-result.t @@ -244,14 +244,14 @@ Stabilize it - $ hg evolve -qn --confirm --contentdivergent + $ hg evolve -qn --confirm --content-divergent merge:[14] More addition with: [13] More addition base: [12] More addition perform evolve? [Ny] n abort: evolve aborted by user [255] - $ echo y | hg evolve -qn --confirm --config ui.interactive=True --contentdivergent + $ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent merge:[14] More addition with: [13] More addition base: [12] More addition @@ -262,7 +262,7 @@ hg up -C 3932c176bbaa && hg revert --all --rev tip && hg commit -m "`hg log -r eacc9c8240fe --template={desc}`"; - $ hg evolve -v --contentdivergent + $ hg evolve -v --content-divergent merge:[14] More addition with: [13] More addition base: [12] More addition @@ -336,14 +336,14 @@ $ hg phase 'contentdivergent()' 15: draft 17: draft - $ hg evolve -qn --contentdivergent + $ hg evolve -qn --content-divergent hg update -c 0b336205a5d0 && hg merge f344982e63c4 && hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&& hg up -C 3932c176bbaa && hg revert --all --rev tip && hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`"; - $ hg evolve --contentdivergent + $ hg evolve --content-divergent merge:[17] More addition (2) with: [15] More addition base: [12] More addition
--- a/tests/test-uncommit.t +++ b/tests/test-uncommit.t @@ -287,7 +287,7 @@ $ hg up -C 3 --hidden 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (5eb72dbe0cb4) - (5eb72dbe0cb4 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) + (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) $ hg --config extensions.purge= purge $ hg uncommit --all -X e 1 new content-divergent changesets