Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py	Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py	Tue Oct 06 17:52:44 2020 +0200
@@ -83,7 +83,7 @@
         res = False
         from .HgShelveDataDialog import HgShelveDataDialog
         dlg = HgShelveDataDialog(self.vcs.version)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             shelveName, dateTime, message, addRemove, keep = dlg.getData()
             
             args = self.vcs.initCommand("shelve")
@@ -110,7 +110,7 @@
             dia = HgDialog(self.tr('Shelve current changes'), self.vcs)
             res = dia.startProcess(args, repodir)
             if res:
-                dia.exec_()
+                dia.exec()
                 res = dia.hasAddOrDelete()
                 self.vcs.checkVCSStatus()
         return res
@@ -147,7 +147,7 @@
         from .HgUnshelveDataDialog import HgUnshelveDataDialog
         dlg = HgUnshelveDataDialog(self.__hgGetShelveNamesList(repodir),
                                    shelveName=shelveName)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             shelveName, keep = dlg.getData()
             self.__unshelveKeep = keep  # store for potential continue
             
@@ -160,7 +160,7 @@
             dia = HgDialog(self.tr('Restore shelved changes'), self.vcs)
             res = dia.startProcess(args, repodir)
             if res:
-                dia.exec_()
+                dia.exec()
                 res = dia.hasAddOrDelete()
                 self.vcs.checkVCSStatus()
         return res
@@ -185,7 +185,7 @@
         dia = HgDialog(self.tr('Abort restore operation'), self.vcs)
         res = dia.startProcess(args, repodir)
         if res:
-            dia.exec_()
+            dia.exec()
             res = dia.hasAddOrDelete()
             self.vcs.checkVCSStatus()
         return res
@@ -212,7 +212,7 @@
         dia = HgDialog(self.tr('Continue restore operation'), self.vcs)
         res = dia.startProcess(args, repodir)
         if res:
-            dia.exec_()
+            dia.exec()
             res = dia.hasAddOrDelete()
             self.vcs.checkVCSStatus()
         return res
@@ -236,7 +236,7 @@
             dlg = HgShelvesSelectionDialog(
                 self.tr("Select the shelves to be deleted:"),
                 self.__hgGetShelveNamesList(repodir))
-            if dlg.exec_() == QDialog.Accepted:
+            if dlg.exec() == QDialog.Accepted:
                 shelveNames = dlg.getSelectedShelves()
             else:
                 return
@@ -249,7 +249,7 @@
             self.tr("Delete shelves"),
             self.tr("Do you really want to delete these shelves?"),
             shelveNames)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             args = self.vcs.initCommand("shelve")
             args.append("--delete")
             args.extend(shelveNames)
@@ -257,7 +257,7 @@
             dia = HgDialog(self.tr('Delete shelves'), self.vcs)
             res = dia.startProcess(args, repodir)
             if res:
-                dia.exec_()
+                dia.exec()
     
     def hgCleanupShelves(self, name):
         """
@@ -283,4 +283,4 @@
             dia = HgDialog(self.tr('Delete all shelves'), self.vcs)
             res = dia.startProcess(args, repodir)
             if res:
-                dia.exec_()
+                dia.exec()