##// END OF EJS Templates
push: use bundle2 to push obsmarkers when possible
Pierre-Yves David -
r22347:7198cb9b default
parent child Browse files
Show More
@@ -438,6 +438,17 b' def _pushb2phases(pushop, bundler):'
438 pushop.ui.warn(msg)
438 pushop.ui.warn(msg)
439 return handlereply
439 return handlereply
440
440
441 @b2partsgenerator('obsmarkers')
442 def _pushb2obsmarkers(pushop, bundler):
443 if 'obsmarkers' in pushop.stepsdone:
444 return
445 remoteversions = bundle2.obsmarkersversion(bundler.capabilities)
446 if obsolete.commonversion(remoteversions) is None:
447 return
448 pushop.stepsdone.add('obsmarkers')
449 if pushop.outobsmarkers:
450 buildobsmarkerspart(bundler, pushop.outobsmarkers)
451
441 @b2partsgenerator('bookmarks')
452 @b2partsgenerator('bookmarks')
442 def _pushb2bookmarks(pushop, bundler):
453 def _pushb2bookmarks(pushop, bundler):
443 """handle phase push through bundle2"""
454 """handle phase push through bundle2"""
@@ -878,6 +878,7 b' push'
878 remote: adding manifests
878 remote: adding manifests
879 remote: adding file changes
879 remote: adding file changes
880 remote: added 1 changesets with 0 changes to 0 files (-1 heads)
880 remote: added 1 changesets with 0 changes to 0 files (-1 heads)
881 remote: 5 new obsolescence markers
881 updating bookmark book_eea1
882 updating bookmark book_eea1
882 exporting bookmark book_eea1
883 exporting bookmark book_eea1
883 $ hg -R other log -G
884 $ hg -R other log -G
General Comments 0
You need to be logged in to leave comments. Login now