Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py	Sat Mar 06 10:00:52 2021 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py	Sun Mar 28 15:00:11 2021 +0200
@@ -68,7 +68,7 @@
         res = False
         from .HgShelveDataDialog import HgShelveDataDialog
         dlg = HgShelveDataDialog(self.vcs.version)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             shelveName, dateTime, message, addRemove, keep = dlg.getData()
             
             args = self.vcs.initCommand("shelve")
@@ -122,7 +122,7 @@
         from .HgUnshelveDataDialog import HgUnshelveDataDialog
         dlg = HgUnshelveDataDialog(self.__hgGetShelveNamesList(),
                                    shelveName=shelveName)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             shelveName, keep = dlg.getData()
             self.__unshelveKeep = keep  # store for potential continue
             
@@ -187,7 +187,7 @@
             dlg = HgShelvesSelectionDialog(
                 self.tr("Select the shelves to be deleted:"),
                 self.__hgGetShelveNamesList())
-            if dlg.exec() == QDialog.Accepted:
+            if dlg.exec() == QDialog.DialogCode.Accepted:
                 shelveNames = dlg.getSelectedShelves()
             else:
                 return
@@ -200,7 +200,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.DialogCode.Accepted:
             args = self.vcs.initCommand("shelve")
             args.append("--delete")
             args.extend(shelveNames)