Mercurial Repositories > eric / file diff

diff -r 8938a2a66dee -r ef3f13a2c599 Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Fri May 09 15:53:40 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Mon May 12 18:19:22 2014 +0200
@@ -66,16 +66,10 @@
                 return
         
         if rev is None:
-            if self.vcs.isExtensionActive("bookmarks"):
-                bookmarksList = \
-                    self.vcs.getExtensionObject("bookmarks")\
-                        .hgGetBookmarksList(repodir)
-            else:
-                bookmarksList = None
             dlg = HgRevisionSelectionDialog(
                 self.vcs.hgGetTagsList(repodir),
                 self.vcs.hgGetBranchesList(repodir),
-                bookmarksList)
+                self.vcs.hgGetBookmarksList(repodir))
             if dlg.exec_() == QDialog.Accepted:
                 rev = dlg.getRevision()
         
@@ -103,16 +97,10 @@
             if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
-        if self.vcs.isExtensionActive("bookmarks"):
-            bookmarksList = \
-                self.vcs.getExtensionObject("bookmarks")\
-                    .hgGetBookmarksList(repodir)
-        else:
-            bookmarksList = None
         from .HgGpgSignDialog import HgGpgSignDialog
         dlg = HgGpgSignDialog(self.vcs.hgGetTagsList(repodir),
                               self.vcs.hgGetBranchesList(repodir),
-                              bookmarksList)
+                              self.vcs.hgGetBookmarksList(repodir))
         if dlg.exec_() == QDialog.Accepted:
             revision, noCommit, message, keyId, local, force = dlg.getData()