Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Tue Oct 06 17:52:44 2020 +0200
@@ -48,7 +48,7 @@
                              self.vcs.hgGetBranchesList(repodir),
                              self.vcs.hgGetBookmarksList(repodir),
                              self.vcs.version)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             (indicator, sourceRev, destRev, collapse, keep, keepBranches,
              detach, dryRunOnly, dryRunConfirm) = dlg.getData()
             
@@ -79,7 +79,7 @@
             dia = HgDialog(self.tr('Rebase Changesets'), self.vcs)
             res = dia.startProcess(args, repodir)
             if res:
-                dia.exec_()
+                dia.exec()
                 res = dia.hasAddOrDelete()
                 self.vcs.checkVCSStatus()
         return res
@@ -105,7 +105,7 @@
         dia = HgDialog(self.tr('Rebase Changesets (Continue)'), self.vcs)
         res = dia.startProcess(args, repodir)
         if res:
-            dia.exec_()
+            dia.exec()
             res = dia.hasAddOrDelete()
             self.vcs.checkVCSStatus()
         return res
@@ -131,7 +131,7 @@
         dia = HgDialog(self.tr('Rebase Changesets (Abort)'), self.vcs)
         res = dia.startProcess(args, repodir)
         if res:
-            dia.exec_()
+            dia.exec()
             res = dia.hasAddOrDelete()
             self.vcs.checkVCSStatus()
         return res