Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py	Fri Oct 25 09:47:48 2024 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py	Fri Oct 25 17:58:59 2024 +0200
@@ -21,14 +21,16 @@
     Class implementing the shelve extension interface.
     """
 
-    def __init__(self, vcs):
+    def __init__(self, vcs, ui=None):
         """
         Constructor
 
         @param vcs reference to the Mercurial vcs object
         @type Hg
+        @param ui reference to a UI widget (defaults to None)
+        @type QWidget
         """
-        super().__init__(vcs)
+        super().__init__(vcs, ui=ui)
 
         self.__unshelveKeep = False
 
@@ -74,7 +76,7 @@
         from .HgShelveDataDialog import HgShelveDataDialog
 
         res = False
-        dlg = HgShelveDataDialog(self.vcs.version)
+        dlg = HgShelveDataDialog(self.vcs.version, parent=self.ui)
         if dlg.exec() == QDialog.DialogCode.Accepted:
             shelveName, dateTime, message, addRemove, keep = dlg.getData()
 
@@ -99,7 +101,9 @@
             else:
                 args.append(name)
 
-            dia = HgDialog(self.tr("Shelve current changes"), self.vcs)
+            dia = HgDialog(
+                self.tr("Shelve current changes"), hg=self.vcs, parent=self.ui
+            )
             res = dia.startProcess(args)
             if res:
                 dia.exec()
@@ -130,7 +134,9 @@
         from .HgUnshelveDataDialog import HgUnshelveDataDialog
 
         res = False
-        dlg = HgUnshelveDataDialog(self.__hgGetShelveNamesList(), shelveName=shelveName)
+        dlg = HgUnshelveDataDialog(
+            self.__hgGetShelveNamesList(), shelveName=shelveName, parent=self.ui
+        )
         if dlg.exec() == QDialog.DialogCode.Accepted:
             shelveName, keep = dlg.getData()
             self.__unshelveKeep = keep  # store for potential continue
@@ -141,7 +147,9 @@
             if shelveName:
                 args.append(shelveName)
 
-            dia = HgDialog(self.tr("Restore shelved changes"), self.vcs)
+            dia = HgDialog(
+                self.tr("Restore shelved changes"), hg=self.vcs, parent=self.ui
+            )
             res = dia.startProcess(args)
             if res:
                 dia.exec()
@@ -159,7 +167,7 @@
         args = self.vcs.initCommand("unshelve")
         args.append("--abort")
 
-        dia = HgDialog(self.tr("Abort restore operation"), self.vcs)
+        dia = HgDialog(self.tr("Abort restore operation"), hg=self.vcs, parent=self.ui)
         res = dia.startProcess(args)
         if res:
             dia.exec()
@@ -179,7 +187,9 @@
             args.append("--keep")
         args.append("--continue")
 
-        dia = HgDialog(self.tr("Continue restore operation"), self.vcs)
+        dia = HgDialog(
+            self.tr("Continue restore operation"), hg=self.vcs, parent=self.ui
+        )
         res = dia.startProcess(args)
         if res:
             dia.exec()
@@ -200,6 +210,7 @@
             dlg = HgShelvesSelectionDialog(
                 self.tr("Select the shelves to be deleted:"),
                 self.__hgGetShelveNamesList(),
+                parent=self.ui,
             )
             if dlg.exec() == QDialog.DialogCode.Accepted:
                 shelveNames = dlg.getSelectedShelves()
@@ -207,7 +218,7 @@
                 return
 
         dlg = DeleteFilesConfirmationDialog(
-            None,
+            self.ui,
             self.tr("Delete shelves"),
             self.tr("Do you really want to delete these shelves?"),
             shelveNames,
@@ -217,7 +228,7 @@
             args.append("--delete")
             args.extend(shelveNames)
 
-            dia = HgDialog(self.tr("Delete shelves"), self.vcs)
+            dia = HgDialog(self.tr("Delete shelves"), hg=self.vcs, parent=self.ui)
             res = dia.startProcess(args)
             if res:
                 dia.exec()
@@ -235,7 +246,7 @@
             args = self.vcs.initCommand("shelve")
             args.append("--cleanup")
 
-            dia = HgDialog(self.tr("Delete all shelves"), self.vcs)
+            dia = HgDialog(self.tr("Delete all shelves"), hg=self.vcs, parent=self.ui)
             res = dia.startProcess(args)
             if res:
                 dia.exec()