Mercurial > evolve

changeset 355:72642a6970e0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: warn on conflicting changeset too
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Wed, 11 Jul 2012 13:38:48 +0200
parents bd26eb9714fb
children 56d4c6207ef9
files hgext/evolve.py
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Wed Jul 11 12:38:05 2012 +0200
+++ b/hgext/evolve.py	Wed Jul 11 13:38:48 2012 +0200
@@ -37,6 +37,7 @@
     """display warning is the command resulted in more instable changeset"""
     priorunstables = len(repo.revs('unstable()'))
     priorlatecomers = len(repo.revs('latecomer()'))
+    priorconflictings = len(repo.revs('conflicting()'))
     #print orig, priorunstables
     #print len(repo.revs('secret() - obsolete()'))
     try:
@@ -44,12 +45,15 @@
     finally:
         newunstables = len(repo.revs('unstable()')) - priorunstables
         newlatecomers = len(repo.revs('latecomer()')) - priorlatecomers
+        newconflictings = len(repo.revs('conflicting()')) - priorconflictings
         #print orig, newunstables
         #print len(repo.revs('secret() - obsolete()'))
         if newunstables > 0:
             ui.warn(_('%i new unstables changesets\n') % newunstables)
         if newlatecomers > 0:
             ui.warn(_('%i new latecomers changesets\n') % newlatecomers)
+        if newconflictings > 0:
+            ui.warn(_('%i new conflictings changesets\n') % newconflictings)
 
 ### changeset rewriting logic
 #############################