# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 2010-08-23 20:22:05
# Node ID e1a3d7ed478e3eb0301cad386ea998dc138e3fb1
# Parent  2315a95ee88759ad2ed250dcbf2fc93be4073688
# Parent  1938954354ec9cfa564b50b35d822863ba40ab37

Merge with stable

diff --git a/hgext/bookmarks.py b/hgext/bookmarks.py
--- a/hgext/bookmarks.py
+++ b/hgext/bookmarks.py
@@ -370,6 +370,11 @@ def reposetup(ui, repo):
     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)