Mercurial > evolve

changeset 378:0313cb49fa1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
files hgext/obsolete.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/obsolete.py	Wed Jul 25 17:53:17 2012 +0200
+++ b/hgext/obsolete.py	Wed Jul 25 18:09:11 2012 +0200
@@ -475,7 +475,7 @@
             def branchmap():
                 newbm = {}
                 oldbm = None
-                if (util.safehasattr(phases, 'visiblebranchmap')
+                if (util.safehasattr(discovery, 'visiblebranchmap')
                     and not util.safehasattr(remote, 'ignorevisiblebranchmap')
                    ):
                     remote.ignorevisiblebranchmap = False
@@ -717,10 +717,10 @@
         extensions.wrapfunction(cmdutil, 'amend', wrapcmdutilamend)
     extensions.wrapfunction(discovery, 'findcommonoutgoing', wrapfindcommonoutgoing)
     extensions.wrapfunction(discovery, 'checkheads', wrapcheckheads)
-    extensions.wrapfunction(phases, 'visibleheads', noextinctsvisibleheads)
+    extensions.wrapfunction(discovery, 'visibleheads', noextinctsvisibleheads)
     extensions.wrapfunction(phases, 'advanceboundary', wrapclearcache)
-    if util.safehasattr(phases, 'visiblebranchmap'):
-        extensions.wrapfunction(phases, 'visiblebranchmap', wrapvisiblebranchmap)
+    if util.safehasattr(discovery, 'visiblebranchmap'):
+        extensions.wrapfunction(discovery, 'visiblebranchmap', wrapvisiblebranchmap)
 
 ### serialisation
 #############################