Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py

branch
Py2 comp.
changeset 3057
10516539f238
parent 2525
8b507a9a2d40
parent 3008
7848489bcb92
child 3145
a9de05d4a22f
diff -r 9986ec0e559a -r 10516539f238 Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Tue Oct 15 22:03:54 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Fri Oct 18 23:00:41 2013 +0200
@@ -46,7 +46,8 @@
         res = False
         if self.vcs.isExtensionActive("bookmarks"):
             bookmarksList = \
-                self.vcs.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
+                self.vcs.getExtensionObject("bookmarks")\
+                    .hgGetBookmarksList(repodir)
         else:
             bookmarksList = None
         from .HgRebaseDialog import HgRebaseDialog
@@ -54,8 +55,8 @@
                              self.vcs.hgGetBranchesList(repodir),
                              bookmarksList)
         if dlg.exec_() == QDialog.Accepted:
-            indicator, sourceRev, destRev, collapse, keep, keepBranches, detach = \
-                dlg.getData()
+            (indicator, sourceRev, destRev, collapse, keep, keepBranches,
+             detach) = dlg.getData()
             
             args = []
             args.append("rebase")

eric ide

mercurial