Mercurial Mercurial > hg / 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.
obsmarker: write a message with the number of markers added through bundle2
authorPierre-Yves David <pierre-yves.david@fb.com>
Mon, 25 Aug 2014 18:09:54 +0200
changeset 22337 c380fe290290
parent 22336 60786c8a2f70
child 22338 8fcd56095d3b
obsmarker: write a message with the number of markers added through bundle2
mercurial/bundle2.py file | annotate | diff | comparison | revisions 
--- 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)
Mercurial