##// END OF EJS Templates
push: feed pulloperation object to _pullobsolete function...
Pierre-Yves David -
r20478:80628d40 default
parent child Browse files
Show More
@@ -484,8 +484,7 b' def pull(repo, remote, heads=None, force'
484 # should be seen as public
484 # should be seen as public
485 phases.advanceboundary(pullop.repo, phases.public, subset)
485 phases.advanceboundary(pullop.repo, phases.public, subset)
486
486
487 _pullobsolete(pullop.repo, pullop.remote,
487 _pullobsolete(pullop)
488 pullop.gettransaction)
489 pullop.closetransaction()
488 pullop.closetransaction()
490 finally:
489 finally:
491 pullop.releasetransaction()
490 pullop.releasetransaction()
@@ -493,7 +492,7 b' def pull(repo, remote, heads=None, force'
493
492
494 return result
493 return result
495
494
496 def _pullobsolete(repo, remote, gettransaction):
495 def _pullobsolete(pullop):
497 """utility function to pull obsolete markers from a remote
496 """utility function to pull obsolete markers from a remote
498
497
499 The `gettransaction` is function that return the pull transaction, creating
498 The `gettransaction` is function that return the pull transaction, creating
@@ -503,14 +502,14 b' def _pullobsolete(repo, remote, gettrans'
503 Exists mostly to allow overriding for experimentation purpose"""
502 Exists mostly to allow overriding for experimentation purpose"""
504 tr = None
503 tr = None
505 if obsolete._enabled:
504 if obsolete._enabled:
506 repo.ui.debug('fetching remote obsolete markers\n')
505 pullop.repo.ui.debug('fetching remote obsolete markers\n')
507 remoteobs = remote.listkeys('obsolete')
506 remoteobs = pullop.remote.listkeys('obsolete')
508 if 'dump0' in remoteobs:
507 if 'dump0' in remoteobs:
509 tr = gettransaction()
508 tr = pullop.gettransaction()
510 for key in sorted(remoteobs, reverse=True):
509 for key in sorted(remoteobs, reverse=True):
511 if key.startswith('dump'):
510 if key.startswith('dump'):
512 data = base85.b85decode(remoteobs[key])
511 data = base85.b85decode(remoteobs[key])
513 repo.obsstore.mergemarkers(tr, data)
512 pullop.repo.obsstore.mergemarkers(tr, data)
514 repo.invalidatevolatilesets()
513 pullop.repo.invalidatevolatilesets()
515 return tr
514 return tr
516
515
General Comments 0
You need to be logged in to leave comments. Login now