changeset 22337:c380fe290290

obsmarker: write a message with the number of markers added through bundle2
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 25 Aug 2014 18:09:54 +0200
parents 60786c8a2f70
children 8fcd56095d3b
files mercurial/bundle2.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/bundle2.py	Mon Aug 25 18:08:22 2014 +0200
+++ b/mercurial/bundle2.py	Mon Aug 25 18:09:54 2014 +0200
@@ -904,4 +904,6 @@
 def handleobsmarker(op, inpart):
     """add a stream of obsmarkers to the repo"""
     tr = op.gettransaction()
-    op.repo.obsstore.mergemarkers(tr, inpart.read())
+    new = op.repo.obsstore.mergemarkers(tr, inpart.read())
+    if new:
+        op.repo.ui.status(_('%i new obsolescence markers\n') % new)