diff hgext/obsolete.py @ 378:0313cb49fa1a

obsolete: fix visibleheads/branchmap wrapping

--- 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
 #############################