Merge with stable
authorMartin Geisler <mg@lazybytes.net>
Mon, 23 Aug 2010 22:22:05 +0200
changeset 12027 e1a3d7ed478e
parent 12025 2315a95ee887 (current diff)
parent 12026 1938954354ec (diff)
child 12031 77bbeafd7519
Merge with stable
hgext/bookmarks.py
--- a/hgext/bookmarks.py	Mon Aug 23 13:28:04 2010 +0200
+++ b/hgext/bookmarks.py	Mon Aug 23 22:22:05 2010 +0200
@@ -370,6 +370,11 @@
     repo.__class__ = bookmark_repo
 
 def listbookmarks(repo):
+    # We may try to list bookmarks on a repo type that does not
+    # support it (e.g., statichttprepository).
+    if not hasattr(repo, '_bookmarks'):
+        return {}
+
     d = {}
     for k, v in repo._bookmarks.iteritems():
         d[k] = hex(v)