Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py	Fri Oct 25 09:47:48 2024 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py	Fri Oct 25 17:58:59 2024 +0200
@@ -25,14 +25,16 @@
     Class implementing the largefiles 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)
 
     def hgLfconvert(self, direction, projectFile):
         """
@@ -52,7 +54,7 @@
 
         projectDir = os.path.dirname(projectFile)
 
-        dlg = LfConvertDataDialog(projectDir, direction)
+        dlg = LfConvertDataDialog(projectDir, direction, parent=self.ui)
         if dlg.exec() == QDialog.DialogCode.Accepted:
             newName, minSize, patterns = dlg.getData()
             newProjectFile = os.path.join(newName, os.path.basename(projectFile))
@@ -69,7 +71,9 @@
             if direction == "largefiles" and patterns:
                 args.extend(patterns)
 
-            dia = HgDialog(self.tr("Convert Project - Converting"), self.vcs)
+            dia = HgDialog(
+                self.tr("Convert Project - Converting"), hg=self.vcs, parent=self.ui
+            )
             res = dia.startProcess(args)
             if res:
                 dia.exec()
@@ -97,7 +101,7 @@
                 args = self.vcs.initCommand("update")
                 args.append("--verbose")
                 dia = HgDialog(
-                    self.tr("Convert Project - Extracting"), self.vcs, client=client
+                    self.tr("Convert Project - Extracting"), hg=self.vcs, parent=self.ui
                 )
                 res = dia.startProcess(args)
                 if res:
@@ -142,7 +146,11 @@
         else:
             args.append(names)
 
-        dia = HgDialog(self.tr("Adding files to the Mercurial repository"), self.vcs)
+        dia = HgDialog(
+            self.tr("Adding files to the Mercurial repository"),
+            hg=self.vcs,
+            parent=self.ui,
+        )
         res = dia.startProcess(args)
         if res:
             dia.exec()
@@ -160,7 +168,7 @@
         if revisions:
             revs = revisions
         else:
-            dlg = LfRevisionsInputDialog()
+            dlg = LfRevisionsInputDialog(parent=self.ui)
             if dlg.exec() == QDialog.DialogCode.Accepted:
                 revs = dlg.getRevisions()
 
@@ -171,7 +179,7 @@
                 args.append("--rev")
                 args.append(rev)
 
-            dia = HgDialog(self.tr("Pulling large files"), self.vcs)
+            dia = HgDialog(self.tr("Pulling large files"), hg=self.vcs, parent=self.ui)
             res = dia.startProcess(args)
             if res:
                 dia.exec()
@@ -193,7 +201,11 @@
         else:
             return
 
-        dia = HgDialog(self.tr("Verifying the integrity of large files"), self.vcs)
+        dia = HgDialog(
+            self.tr("Verifying the integrity of large files"),
+            hg=self.vcs,
+            parent=self.ui,
+        )
         res = dia.startProcess(args)
         if res:
             dia.exec()