Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py

changeset 3562
ef3f13a2c599
parent 3484
645c12de6b0c
child 3656
441956d8fce5
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Fri May 09 15:53:40 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Mon May 12 18:19:22 2014 +0200
@@ -44,16 +44,10 @@
                 return False
         
         res = False
-        if self.vcs.isExtensionActive("bookmarks"):
-            bookmarksList = \
-                self.vcs.getExtensionObject("bookmarks")\
-                    .hgGetBookmarksList(repodir)
-        else:
-            bookmarksList = None
         from .HgRebaseDialog import HgRebaseDialog
         dlg = HgRebaseDialog(self.vcs.hgGetTagsList(repodir),
                              self.vcs.hgGetBranchesList(repodir),
-                             bookmarksList)
+                             self.vcs.hgGetBookmarksList(repodir))
         if dlg.exec_() == QDialog.Accepted:
             (indicator, sourceRev, destRev, collapse, keep, keepBranches,
              detach) = dlg.getData()

eric ide

mercurial