Quickjump should list all bookmarks, not only those of current revision

[Jun Omae]

After #10527 and #11995, MercurialRepository.get_quickjump_entries(rev) lists only bookmarks for current revision. The method should list all bookmarks regardless of value of rev argument.

Suggestion from comment:5:ticket:11431.

tracext/hg/backend.py

@@ -114 +114 @@
     else:
         from mercurial.scmutil import match
 
-    has_bookmarks = None
+    try:
+        from mercurial.bookmarks import listbookmarks
+    except ImportError:
+        try:
+            from hgext.bookmarks import listbookmarks
+        except ImportError:
+            listbookmarks = None
+    has_bookmarks = bool(listbookmarks)
     has_phasestr = None
 
 except ImportError, e:
@@ -152 +159 @@
         return s
 
 def get_bookmarks(ctx):
-    global has_bookmarks
     if has_bookmarks:
         return ctx.bookmarks()
-    if has_bookmarks is None:
-        has_bookmarks = hasattr(ctx, 'bookmarks')
-        if has_bookmarks:
-            return get_bookmarks(ctx)
-    return ()
+    else:
+        return ()
+
+def get_repo_bookmarks(repo):
+    if has_bookmarks:
+        return listbookmarks(repo)
+    else:
+        return ()
 
 def get_phasestr(ctx):
     global has_phasestr
@@ -689 +698 @@
                 yield ((name or nodestr) + taginfo(ctx), '/', nodestr)
         # bookmarks
         bookmarks = [(self.changectx(b), b)
-                     for b in get_bookmarks(self.changectx(rev))]
+                     for b in get_repo_bookmarks(self.repo)]
         for e in quickjump_entries(bookmarks):
             yield _("Bookmarks"), e[0], e[1], e[2]
         # branches

[Peter Suter]

Pushed with test in [55/mercurial-plugin].