Show More
@@ -1401,6 +1401,22 b' def addparttagsfnodescache(repo, bundler' | |||||
1401 | if chunks: |
|
1401 | if chunks: | |
1402 | bundler.newpart('hgtagsfnodes', data=''.join(chunks)) |
|
1402 | bundler.newpart('hgtagsfnodes', data=''.join(chunks)) | |
1403 |
|
1403 | |||
|
1404 | def buildobsmarkerspart(bundler, markers): | |||
|
1405 | """add an obsmarker part to the bundler with <markers> | |||
|
1406 | ||||
|
1407 | No part is created if markers is empty. | |||
|
1408 | Raises ValueError if the bundler doesn't support any known obsmarker format. | |||
|
1409 | """ | |||
|
1410 | if not markers: | |||
|
1411 | return None | |||
|
1412 | ||||
|
1413 | remoteversions = obsmarkersversion(bundler.capabilities) | |||
|
1414 | version = obsolete.commonversion(remoteversions) | |||
|
1415 | if version is None: | |||
|
1416 | raise ValueError('bundler does not support common obsmarker format') | |||
|
1417 | stream = obsolete.encodemarkers(markers, True, version=version) | |||
|
1418 | return bundler.newpart('obsmarkers', data=stream) | |||
|
1419 | ||||
1404 | def writebundle(ui, cg, filename, bundletype, vfs=None, compression=None, |
|
1420 | def writebundle(ui, cg, filename, bundletype, vfs=None, compression=None, | |
1405 | compopts=None): |
|
1421 | compopts=None): | |
1406 | """Write a bundle file and return its filename. |
|
1422 | """Write a bundle file and return its filename. |
@@ -248,21 +248,6 b' def getbundlespec(ui, fh):' | |||||
248 | else: |
|
248 | else: | |
249 | raise error.Abort(_('unknown bundle type: %s') % b) |
|
249 | raise error.Abort(_('unknown bundle type: %s') % b) | |
250 |
|
250 | |||
251 | def buildobsmarkerspart(bundler, markers): |
|
|||
252 | """add an obsmarker part to the bundler with <markers> |
|
|||
253 |
|
||||
254 | No part is created if markers is empty. |
|
|||
255 | Raises ValueError if the bundler doesn't support any known obsmarker format. |
|
|||
256 | """ |
|
|||
257 | if markers: |
|
|||
258 | remoteversions = bundle2.obsmarkersversion(bundler.capabilities) |
|
|||
259 | version = obsolete.commonversion(remoteversions) |
|
|||
260 | if version is None: |
|
|||
261 | raise ValueError('bundler does not support common obsmarker format') |
|
|||
262 | stream = obsolete.encodemarkers(markers, True, version=version) |
|
|||
263 | return bundler.newpart('obsmarkers', data=stream) |
|
|||
264 | return None |
|
|||
265 |
|
||||
266 | def _computeoutgoing(repo, heads, common): |
|
251 | def _computeoutgoing(repo, heads, common): | |
267 | """Computes which revs are outgoing given a set of common |
|
252 | """Computes which revs are outgoing given a set of common | |
268 | and a set of heads. |
|
253 | and a set of heads. | |
@@ -822,7 +807,7 b' def _pushb2obsmarkers(pushop, bundler):' | |||||
822 | pushop.stepsdone.add('obsmarkers') |
|
807 | pushop.stepsdone.add('obsmarkers') | |
823 | if pushop.outobsmarkers: |
|
808 | if pushop.outobsmarkers: | |
824 | markers = sorted(pushop.outobsmarkers) |
|
809 | markers = sorted(pushop.outobsmarkers) | |
825 | buildobsmarkerspart(bundler, markers) |
|
810 | bundle2.buildobsmarkerspart(bundler, markers) | |
826 |
|
811 | |||
827 | @b2partsgenerator('bookmarks') |
|
812 | @b2partsgenerator('bookmarks') | |
828 | def _pushb2bookmarks(pushop, bundler): |
|
813 | def _pushb2bookmarks(pushop, bundler): | |
@@ -1648,7 +1633,7 b' def _getbundleobsmarkerpart(bundler, rep' | |||||
1648 | subset = [c.node() for c in repo.set('::%ln', heads)] |
|
1633 | subset = [c.node() for c in repo.set('::%ln', heads)] | |
1649 | markers = repo.obsstore.relevantmarkers(subset) |
|
1634 | markers = repo.obsstore.relevantmarkers(subset) | |
1650 | markers = sorted(markers) |
|
1635 | markers = sorted(markers) | |
1651 | buildobsmarkerspart(bundler, markers) |
|
1636 | bundle2.buildobsmarkerspart(bundler, markers) | |
1652 |
|
1637 | |||
1653 | @getbundle2partsgenerator('hgtagsfnodes') |
|
1638 | @getbundle2partsgenerator('hgtagsfnodes') | |
1654 | def _getbundletagsfnodes(bundler, repo, source, bundlecaps=None, |
|
1639 | def _getbundletagsfnodes(bundler, repo, source, bundlecaps=None, |
General Comments 0
You need to be logged in to leave comments.
Login now