diff -r b918c6c2736b -r a671918232f3 src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Fri Oct 25 09:47:48 2024 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Fri Oct 25 17:58:59 2024 +0200
@@ -18,14 +18,16 @@
Class implementing the rebase 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 hgRebase(self):
"""
@@ -42,6 +44,7 @@
self.vcs.hgGetBranchesList(),
self.vcs.hgGetBookmarksList(),
self.vcs.version,
+ parent=self.ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
(
@@ -80,7 +83,7 @@
args.append("--confirm")
args.append("--verbose")
- dia = HgDialog(self.tr("Rebase Changesets"), self.vcs)
+ dia = HgDialog(self.tr("Rebase Changesets"), hg=self.vcs, parent=self.ui)
res = dia.startProcess(args)
if res:
dia.exec()
@@ -99,7 +102,9 @@
args.append("--continue")
args.append("--verbose")
- dia = HgDialog(self.tr("Rebase Changesets (Continue)"), self.vcs)
+ dia = HgDialog(
+ self.tr("Rebase Changesets (Continue)"), hg=self.vcs, parent=self.ui
+ )
res = dia.startProcess(args)
if res:
dia.exec()
@@ -118,7 +123,9 @@
args.append("--abort")
args.append("--verbose")
- dia = HgDialog(self.tr("Rebase Changesets (Abort)"), self.vcs)
+ dia = HgDialog(
+ self.tr("Rebase Changesets (Abort)"), hg=self.vcs, parent=self.ui
+ )
res = dia.startProcess(args)
if res:
dia.exec()
