changeset 1084:5459d9f48fea

evolve: display more message
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 27 Aug 2014 17:55:20 +0200
parents 46048124c44b
children 0f31e3c44d82
files hgext/evolve.py
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Wed Aug 27 17:36:35 2014 +0200
+++ b/hgext/evolve.py	Wed Aug 27 17:55:20 2014 +0200
@@ -2469,7 +2469,9 @@
     try:
         tr = peer._repo.transaction('pushkey: obsolete markers')
         try:
-            peer._repo.obsstore.mergemarkers(tr, data)
+            new = peer._repo.obsstore.mergemarkers(tr, data)
+            if new is not None:
+                obsexcmsg(peer._repo.ui, "%i obsolescence markers added\n" % new, True)
             tr.close()
         finally:
             tr.release()
@@ -2488,7 +2490,9 @@
     try:
         tr = repo.transaction('pushkey: obsolete markers')
         try:
-            repo.obsstore.mergemarkers(tr, data)
+            new = repo.obsstore.mergemarkers(tr, data)
+            if new is not None:
+                obsexcmsg(repo.ui, "%i obsolescence markers added\n" % new, True)
             tr.close()
         finally:
             tr.release()