Mercurial > evolve
changeset 2858:4b934144ed11
messages: use hyphenated '{phase,content}-divergent' in user messages
The hyphenated version is more readable and it's what we use the
{instabilities} template.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 24 Aug 2017 10:57:32 -0700 |
| parents | 0c286d054bcd |
| children | 2a228fb6c23e |
| files | hgext3rd/evolve/__init__.py hgext3rd/evolve/compat.py tests/test-divergent.t tests/test-evolve-bumped.t tests/test-evolve-list.t tests/test-evolve-obshistory.t tests/test-evolve-order.t tests/test-evolve-templates.t tests/test-evolve.t tests/test-inhibit.t tests/test-obsolete.t tests/test-sharing.t tests/test-stabilize-result.t tests/test-touch.t tests/test-uncommit.t |
| diffstat | 15 files changed, 26 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py Thu Aug 24 10:48:38 2017 -0700 +++ b/hgext3rd/evolve/__init__.py Thu Aug 24 10:57:32 2017 -0700 @@ -1383,9 +1383,9 @@ 'directory')), ('r', 'rev', [], _('solves troubles of these revisions')), ('', 'bumped', False, _('solves only bumped changesets')), - ('', 'phasedivergent', False, _('solves only bumped changesets')), + ('', 'phasedivergent', False, _('solves only phase-divergent changesets')), ('', 'divergent', False, _('solves only phasedivergent changesets')), - ('', 'contentdivergent', False, _('solves only contentdivergent changesets')), + ('', 'contentdivergent', 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 '
--- a/hgext3rd/evolve/compat.py Thu Aug 24 10:48:38 2017 -0700 +++ b/hgext3rd/evolve/compat.py Thu Aug 24 10:57:32 2017 -0700 @@ -110,13 +110,13 @@ TROUBLES['CONTENTDIVERGENT'] = 'divergent' context.basectx.contentdivergent = context.basectx.divergent else: - TROUBLES['CONTENTDIVERGENT'] = 'contentdivergent' + TROUBLES['CONTENTDIVERGENT'] = 'content-divergent' if not util.safehasattr(context.basectx, 'phasedivergent'): TROUBLES['PHASEDIVERGENT'] = 'bumped' context.basectx.phasedivergent = context.basectx.bumped else: - TROUBLES['PHASEDIVERGENT'] = 'phasedivergent' + TROUBLES['PHASEDIVERGENT'] = 'phase-divergent' if not util.safehasattr(context.basectx, 'isunstable'): context.basectx.isunstable = context.basectx.troubled
--- a/tests/test-divergent.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-divergent.t Thu Aug 24 10:57:32 2017 -0700 @@ -45,7 +45,7 @@ 1 changesets pruned $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden 1 changesets pruned - 2 new contentdivergent changesets + 2 new content-divergent changesets $ hg log -G @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent] | @@ -88,7 +88,7 @@ 1 changesets pruned $ hg prune -s "desc(cdivergent2)" "desc(_c)" --hidden 1 changesets pruned - 2 new contentdivergent changesets + 2 new content-divergent changesets $ hg log -G @ 8:0a768ef678d9@default(draft) cdivergent2 [content-divergent] | @@ -124,7 +124,7 @@ 1 changesets pruned $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden 1 changesets pruned - 2 new contentdivergent changesets + 2 new content-divergent changesets $ hg log -G @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent] |
--- a/tests/test-evolve-bumped.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-evolve-bumped.t Thu Aug 24 10:57:32 2017 -0700 @@ -67,7 +67,7 @@ pulling from ../public searching for changes no changes found - 1 new phasedivergent changesets + 1 new phase-divergent changesets $ hg evolve -a -A --phasedivergent recreate:[2] tweak a @@ -105,7 +105,7 @@ $ hg commit -m "merge" $ hg commit --amend -m "New message" $ hg phase --public 551127da2a8a --hidden - 1 new phasedivergent changesets + 1 new phase-divergent changesets $ hg log -G @ 7:b28e84916d8c@default(draft) New message |\
--- a/tests/test-evolve-list.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-evolve-list.t Thu Aug 24 10:57:32 2017 -0700 @@ -34,7 +34,7 @@ adding a $ echo b > b && hg ci --amend -m ab $ hg phase --public --rev 0 --hidden - 1 new phasedivergent changesets + 1 new phase-divergent changesets $ hg evolve --list 88cc282e27fc: ab bumped: cb9a9f314b8b (immutable precursor) @@ -64,7 +64,7 @@ rebasing 1:d2ae7f538514 "b" $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True rebasing 1:d2ae7f538514 "b" - 2 new contentdivergent changesets + 2 new content-divergent changesets $ hg evolve --list c882616e9d84: b divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
--- a/tests/test-evolve-obshistory.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-evolve-obshistory.t Thu Aug 24 10:57:32 2017 -0700 @@ -989,7 +989,7 @@ working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: fdf9bde5129a) $ hg amend -m "A2" - 2 new contentdivergent changesets + 2 new content-divergent changesets $ hg log --hidden -G @ changeset: 3:65b757b745b9 | tag: tip
--- a/tests/test-evolve-order.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-evolve-order.t Thu Aug 24 10:57:32 2017 -0700 @@ -252,7 +252,7 @@ 1 new orphan changesets $ hg prune -s 'desc(c3part2)' 'desc(c3_)' 1 changesets pruned - 2 new contentdivergent changesets + 2 new content-divergent changesets $ hg up 'desc(b3prime)' 2 files updated, 0 files merged, 3 files removed, 0 files unresolved $ hg amend -m 'b3second'
--- a/tests/test-evolve-templates.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-evolve-templates.t Thu Aug 24 10:57:32 2017 -0700 @@ -618,7 +618,7 @@ working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: fdf9bde5129a) $ hg amend -m "A2" - 2 new contentdivergent changesets + 2 new content-divergent changesets $ hg log --hidden -G @ changeset: 3:65b757b745b9 | tag: tip
--- a/tests/test-evolve.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-evolve.t Thu Aug 24 10:57:32 2017 -0700 @@ -399,7 +399,7 @@ phase change turning obsolete changeset public issue a bumped warning $ hg phase --hidden --public 7 - 1 new phasedivergent changesets + 1 new phase-divergent changesets all solving bumped troubled @@ -1014,7 +1014,7 @@ $ hg add newfile $ hg commit -m "add new file bumped" -o 11 $ hg phase --public --hidden 11 - 1 new phasedivergent changesets + 1 new phase-divergent changesets $ hg log -G @ 12 : add new file bumped - test |
--- a/tests/test-inhibit.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-inhibit.t Thu Aug 24 10:57:32 2017 -0700 @@ -159,7 +159,7 @@ o 0:54ccbc537fc2 add cA $ hg phase --public 7 - 1 new phasedivergent changesets + 1 new phase-divergent changesets $ hg strip 9 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at cf5c4f4554ce
--- a/tests/test-obsolete.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-obsolete.t Thu Aug 24 10:57:32 2017 -0700 @@ -521,7 +521,7 @@ $ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0 rebasing 3:0d3f46688ccc "add obsol_c" rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip) - 2 new contentdivergent changesets + 2 new content-divergent changesets $ hg --hidden log -q -r 'successors(3)' 4:725c380fe99b 10:2033b4e49474 @@ -572,7 +572,7 @@ $ cd local $ hg phase --hidden --public 11 - 1 new phasedivergent changesets + 1 new phase-divergent changesets $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n' @ 12 - (draft) 6db5e282cb91 add obsol_d''' |
--- a/tests/test-sharing.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-sharing.t Thu Aug 24 10:57:32 2017 -0700 @@ -494,7 +494,7 @@ added 1 changesets with 1 changes to 1 files (+1 heads) 2 new obsolescence markers (run 'hg heads' to see heads, 'hg merge' to merge) - 2 new contentdivergent changesets + 2 new content-divergent changesets Figure SG09: multiple heads! divergence! oh my! $ hg --hidden shortlog -G -r 3::
--- a/tests/test-stabilize-result.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-stabilize-result.t Thu Aug 24 10:57:32 2017 -0700 @@ -141,7 +141,7 @@ Make precursors public $ hg phase --hidden --public 8 - 1 new phasedivergent changesets + 1 new phase-divergent changesets $ glog @ 12:(73b15c7566e9|d5c7ef82d003)@default\(draft\) bk:\[\] newer a (re) | @@ -228,7 +228,7 @@ $ cat a.old >> a $ rm a.old $ hg amend - 2 new contentdivergent changesets + 2 new content-divergent changesets $ glog @ 19:eacc9c8240fe@default(draft) bk:[] More addition | @@ -338,7 +338,7 @@ (use 'hg evolve' to update to its successor: f344982e63c4) $ echo 'gotta break' >> a $ hg amend - 2 new contentdivergent changesets + 2 new content-divergent changesets # reamend so that the case is not the first precursor. $ hg amend -m "More addition (2)" $ hg phase 'contentdivergent()'
--- a/tests/test-touch.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-touch.t Thu Aug 24 10:57:32 2017 -0700 @@ -44,7 +44,7 @@ [1] a reviving this changeset will create divergence unless you make a duplicate. (a)llow divergence or (d)uplicate the changeset? a - 2 new contentdivergent changesets + 2 new content-divergent changesets $ hg log -G @ 4:[0-9a-f]{12} a (re)
--- a/tests/test-uncommit.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-uncommit.t Thu Aug 24 10:57:32 2017 -0700 @@ -244,7 +244,7 @@ (use 'hg evolve' to update to its successor: e8db4aa611f6) $ hg --config extensions.purge= purge $ hg uncommit -I 'set:added() and e' - 2 new contentdivergent changesets + 2 new content-divergent changesets $ hg st --copies A e $ hg st --copies --change . @@ -290,7 +290,7 @@ (5eb72dbe0cb4 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) $ hg --config extensions.purge= purge $ hg uncommit --all -X e - 1 new contentdivergent changesets + 1 new content-divergent changesets $ hg st --copies M b M d