comparison hgext/obsolete.py @ 378:0313cb49fa1a

obsolete: fix visibleheads/branchmap wrapping
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Wed, 25 Jul 2012 18:09:11 +0200
parents 1d6cc8c22cd9
children 881c3eca314a
comparison
equal deleted inserted replaced
377:1d6cc8c22cd9 378:0313cb49fa1a
473 if 'oldbranchmap' not in vars(remote): 473 if 'oldbranchmap' not in vars(remote):
474 remote.oldbranchmap = remote.branchmap 474 remote.oldbranchmap = remote.branchmap
475 def branchmap(): 475 def branchmap():
476 newbm = {} 476 newbm = {}
477 oldbm = None 477 oldbm = None
478 if (util.safehasattr(phases, 'visiblebranchmap') 478 if (util.safehasattr(discovery, 'visiblebranchmap')
479 and not util.safehasattr(remote, 'ignorevisiblebranchmap') 479 and not util.safehasattr(remote, 'ignorevisiblebranchmap')
480 ): 480 ):
481 remote.ignorevisiblebranchmap = False 481 remote.ignorevisiblebranchmap = False
482 remote.branchmap = remote.oldbranchmap 482 remote.branchmap = remote.oldbranchmap
483 oldbm = phases.visiblebranchmap(remote) 483 oldbm = phases.visiblebranchmap(remote)
715 extensions.wrapcommand(commands.table, "debugobsolete", wrapmaycreateobsmarker) 715 extensions.wrapcommand(commands.table, "debugobsolete", wrapmaycreateobsmarker)
716 if util.safehasattr(cmdutil, 'amend'): 716 if util.safehasattr(cmdutil, 'amend'):
717 extensions.wrapfunction(cmdutil, 'amend', wrapcmdutilamend) 717 extensions.wrapfunction(cmdutil, 'amend', wrapcmdutilamend)
718 extensions.wrapfunction(discovery, 'findcommonoutgoing', wrapfindcommonoutgoing) 718 extensions.wrapfunction(discovery, 'findcommonoutgoing', wrapfindcommonoutgoing)
719 extensions.wrapfunction(discovery, 'checkheads', wrapcheckheads) 719 extensions.wrapfunction(discovery, 'checkheads', wrapcheckheads)
720 extensions.wrapfunction(phases, 'visibleheads', noextinctsvisibleheads) 720 extensions.wrapfunction(discovery, 'visibleheads', noextinctsvisibleheads)
721 extensions.wrapfunction(phases, 'advanceboundary', wrapclearcache) 721 extensions.wrapfunction(phases, 'advanceboundary', wrapclearcache)
722 if util.safehasattr(phases, 'visiblebranchmap'): 722 if util.safehasattr(discovery, 'visiblebranchmap'):
723 extensions.wrapfunction(phases, 'visiblebranchmap', wrapvisiblebranchmap) 723 extensions.wrapfunction(discovery, 'visiblebranchmap', wrapvisiblebranchmap)
724 724
725 ### serialisation 725 ### serialisation
726 ############################# 726 #############################
727 727
728 def _obsserialise(obssubrels, flike): 728 def _obsserialise(obssubrels, flike):