mercurial/bundle2.py
changeset 22336 60786c8a2f70
parent 21900 b8bd97085ec9
child 22337 c380fe290290
--- a/mercurial/bundle2.py	Mon Aug 25 16:24:40 2014 +0200
+++ b/mercurial/bundle2.py	Mon Aug 25 18:08:22 2014 +0200
@@ -899,3 +899,9 @@
     ret = int(inpart.params['return'])
     partid = int(inpart.params['in-reply-to'])
     op.records.add('pushkey', {'return': ret}, partid)
+
+@parthandler('b2x:obsmarkers')
+def handleobsmarker(op, inpart):
+    """add a stream of obsmarkers to the repo"""
+    tr = op.gettransaction()
+    op.repo.obsstore.mergemarkers(tr, inpart.read())