Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warning: rename warning message
authorBoris Feld <boris.feld@octobus.net>
Thu, 24 Aug 2017 09:12:09 +0200
changeset 2856 f6517779a7c4
parent 2855 1db0137297f4
child 2857 0c286d054bcd
warning: rename warning message divergent has been renamed into contentdivergent. Use their renamed counterpart in warning message for new unstable changesets. Renaming done according to https://www.mercurial-scm.org/wiki/CEDVocabulary
hgext3rd/evolve/__init__.py file | annotate | diff | comparison | revisions
hgext3rd/evolve/compat.py file | annotate | diff | comparison | revisions
tests/test-divergent.t file | annotate | diff | comparison | revisions
tests/test-evolve-list.t file | annotate | diff | comparison | revisions
tests/test-evolve-obshistory.t file | annotate | diff | comparison | revisions
tests/test-evolve-order.t file | annotate | diff | comparison | revisions
tests/test-evolve-templates.t file | annotate | diff | comparison | revisions
tests/test-obsolete.t file | annotate | diff | comparison | revisions
tests/test-sharing.t file | annotate | diff | comparison | revisions
tests/test-stabilize-result.t file | annotate | diff | comparison | revisions
tests/test-touch.t file | annotate | diff | comparison | revisions
tests/test-uncommit.t file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/__init__.py	Thu Aug 24 09:11:54 2017 +0200
+++ b/hgext3rd/evolve/__init__.py	Thu Aug 24 09:12:09 2017 +0200
@@ -777,7 +777,7 @@
     if newbumpeds > 0:
         ui.warn(base_msg % (newbumpeds, compat.TROUBLES['PHASEDIVERGENT']))
     if newdivergents > 0:
-        ui.warn(_('%i new divergent changesets\n') % newdivergents)
+        ui.warn(_('%i new contentdivergent changesets\n') % newdivergents)
     return ret
 
 @eh.wrapfunction(mercurial.exchange, 'push')
--- a/hgext3rd/evolve/compat.py	Thu Aug 24 09:11:54 2017 +0200
+++ b/hgext3rd/evolve/compat.py	Thu Aug 24 09:12:09 2017 +0200
@@ -107,7 +107,10 @@
     TROUBLES['ORPHAN'] = 'orphan'
 
 if not util.safehasattr(context.basectx, 'contentdivergent'):
+    TROUBLES['CONTENTDIVERGENT'] = 'divergent'
     context.basectx.contentdivergent = context.basectx.divergent
+else:
+    TROUBLES['CONTENTDIVERGENT'] = 'contentdivergent'
 
 if not util.safehasattr(context.basectx, 'phasedivergent'):
     TROUBLES['PHASEDIVERGENT'] = 'bumped'
--- a/tests/test-divergent.t	Thu Aug 24 09:11:54 2017 +0200
+++ b/tests/test-divergent.t	Thu Aug 24 09:12:09 2017 +0200
@@ -45,7 +45,7 @@
   1 changesets pruned
   $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden
   1 changesets pruned
-  2 new divergent changesets
+  2 new contentdivergent 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 divergent changesets
+  2 new contentdivergent 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 divergent changesets
+  2 new contentdivergent changesets
   $ hg log -G
   @  3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
   |
--- a/tests/test-evolve-list.t	Thu Aug 24 09:11:54 2017 +0200
+++ b/tests/test-evolve-list.t	Thu Aug 24 09:12:09 2017 +0200
@@ -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 divergent changesets
+  2 new contentdivergent changesets
   $ hg evolve --list
   c882616e9d84: b
     divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
--- a/tests/test-evolve-obshistory.t	Thu Aug 24 09:11:54 2017 +0200
+++ b/tests/test-evolve-obshistory.t	Thu Aug 24 09:12:09 2017 +0200
@@ -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 divergent changesets
+  2 new contentdivergent changesets
   $ hg log --hidden -G
   @  changeset:   3:65b757b745b9
   |  tag:         tip
--- a/tests/test-evolve-order.t	Thu Aug 24 09:11:54 2017 +0200
+++ b/tests/test-evolve-order.t	Thu Aug 24 09:12:09 2017 +0200
@@ -252,7 +252,7 @@
   1 new orphan changesets
   $ hg prune -s 'desc(c3part2)' 'desc(c3_)'
   1 changesets pruned
-  2 new divergent changesets
+  2 new contentdivergent 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 09:11:54 2017 +0200
+++ b/tests/test-evolve-templates.t	Thu Aug 24 09:12:09 2017 +0200
@@ -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 divergent changesets
+  2 new contentdivergent changesets
   $ hg log --hidden -G
   @  changeset:   3:65b757b745b9
   |  tag:         tip
--- a/tests/test-obsolete.t	Thu Aug 24 09:11:54 2017 +0200
+++ b/tests/test-obsolete.t	Thu Aug 24 09:12:09 2017 +0200
@@ -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 divergent changesets
+  2 new contentdivergent changesets
   $ hg --hidden log -q -r 'successors(3)'
   4:725c380fe99b
   10:2033b4e49474
--- a/tests/test-sharing.t	Thu Aug 24 09:11:54 2017 +0200
+++ b/tests/test-sharing.t	Thu Aug 24 09:12:09 2017 +0200
@@ -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 divergent changesets
+  2 new contentdivergent changesets
 
 Figure SG09: multiple heads! divergence! oh my!
   $ hg --hidden shortlog -G -r 3::
--- a/tests/test-stabilize-result.t	Thu Aug 24 09:11:54 2017 +0200
+++ b/tests/test-stabilize-result.t	Thu Aug 24 09:12:09 2017 +0200
@@ -228,7 +228,7 @@
   $ cat a.old >> a
   $ rm a.old
   $ hg amend
-  2 new divergent changesets
+  2 new contentdivergent 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 divergent changesets
+  2 new contentdivergent 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 09:11:54 2017 +0200
+++ b/tests/test-touch.t	Thu Aug 24 09:12:09 2017 +0200
@@ -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 divergent changesets
+  2 new contentdivergent changesets
   $ hg log -G
   @  4:[0-9a-f]{12} a (re)
   
--- a/tests/test-uncommit.t	Thu Aug 24 09:11:54 2017 +0200
+++ b/tests/test-uncommit.t	Thu Aug 24 09:12:09 2017 +0200
@@ -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 divergent changesets
+  2 new contentdivergent 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 divergent changesets
+  1 new contentdivergent changesets
   $ hg st --copies
   M b
   M d
evolve