Mercurial > evolve

changeset 2855:1db0137297f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warning: rename bumped warning message bumped has been renamed into phasedivergent. Update the warning message when new phasedivergent changesets are detected. Renaming done according to https://www.mercurial-scm.org/wiki/CEDVocabulary
author Boris Feld <boris.feld@octobus.net>
date Thu, 24 Aug 2017 09:11:54 +0200
parents 66796d7b5415
children f6517779a7c4
files hgext3rd/evolve/__init__.py hgext3rd/evolve/compat.py tests/test-evolve-bumped.t tests/test-evolve-list.t tests/test-evolve.t tests/test-inhibit.t tests/test-obsolete.t tests/test-stabilize-result.t
diffstat 8 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py	Thu Aug 24 09:11:06 2017 +0200
+++ b/hgext3rd/evolve/__init__.py	Thu Aug 24 09:11:54 2017 +0200
@@ -775,7 +775,7 @@
     if newunstables > 0:
         ui.warn(base_msg % (newunstables, compat.TROUBLES['ORPHAN']))
     if newbumpeds > 0:
-        ui.warn(_('%i new bumped changesets\n') % newbumpeds)
+        ui.warn(base_msg % (newbumpeds, compat.TROUBLES['PHASEDIVERGENT']))
     if newdivergents > 0:
         ui.warn(_('%i new divergent changesets\n') % newdivergents)
     return ret
--- a/hgext3rd/evolve/compat.py	Thu Aug 24 09:11:06 2017 +0200
+++ b/hgext3rd/evolve/compat.py	Thu Aug 24 09:11:54 2017 +0200
@@ -110,7 +110,10 @@
     context.basectx.contentdivergent = context.basectx.divergent
 
 if not util.safehasattr(context.basectx, 'phasedivergent'):
+    TROUBLES['PHASEDIVERGENT'] = 'bumped'
     context.basectx.phasedivergent = context.basectx.bumped
+else:
+    TROUBLES['PHASEDIVERGENT'] = 'phasedivergent'
 
 if not util.safehasattr(context.basectx, 'isunstable'):
     context.basectx.isunstable = context.basectx.troubled
--- a/tests/test-evolve-bumped.t	Thu Aug 24 09:11:06 2017 +0200
+++ b/tests/test-evolve-bumped.t	Thu Aug 24 09:11:54 2017 +0200
@@ -67,7 +67,7 @@
   pulling from ../public
   searching for changes
   no changes found
-  1 new bumped changesets
+  1 new phasedivergent 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 bumped changesets
+  1 new phasedivergent changesets
   $ hg log -G
   @    7:b28e84916d8c@default(draft) New message
   |\
--- a/tests/test-evolve-list.t	Thu Aug 24 09:11:06 2017 +0200
+++ b/tests/test-evolve-list.t	Thu Aug 24 09:11:54 2017 +0200
@@ -34,7 +34,7 @@
   adding a
   $ echo b > b && hg ci --amend -m ab
   $ hg phase --public --rev 0 --hidden
-  1 new bumped changesets
+  1 new phasedivergent changesets
   $ hg evolve --list
   88cc282e27fc: ab
     bumped: cb9a9f314b8b (immutable precursor)
--- a/tests/test-evolve.t	Thu Aug 24 09:11:06 2017 +0200
+++ b/tests/test-evolve.t	Thu Aug 24 09:11:54 2017 +0200
@@ -399,7 +399,7 @@
 phase change turning obsolete changeset public issue a bumped warning
 
   $ hg phase --hidden --public 7
-  1 new bumped changesets
+  1 new phasedivergent 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 bumped changesets
+  1 new phasedivergent changesets
   $ hg log -G
   @  12	: add new file bumped - test
   |
--- a/tests/test-inhibit.t	Thu Aug 24 09:11:06 2017 +0200
+++ b/tests/test-inhibit.t	Thu Aug 24 09:11:54 2017 +0200
@@ -159,7 +159,7 @@
   o  0:54ccbc537fc2 add cA
   
   $ hg phase --public 7
-  1 new bumped changesets
+  1 new phasedivergent 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 09:11:06 2017 +0200
+++ b/tests/test-obsolete.t	Thu Aug 24 09:11:54 2017 +0200
@@ -572,7 +572,7 @@
 
   $ cd local
   $ hg phase --hidden --public 11
-  1 new bumped changesets
+  1 new phasedivergent changesets
   $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n'
   @  12 - (draft) 6db5e282cb91 add obsol_d'''
   |
--- a/tests/test-stabilize-result.t	Thu Aug 24 09:11:06 2017 +0200
+++ b/tests/test-stabilize-result.t	Thu Aug 24 09:11:54 2017 +0200
@@ -141,7 +141,7 @@
 Make precursors public
 
   $ hg phase --hidden --public 8
-  1 new bumped changesets
+  1 new phasedivergent changesets
   $ glog
   @  12:(73b15c7566e9|d5c7ef82d003)@default\(draft\) bk:\[\] newer a (re)
   |