--- a/src/eric7/Plugins/VcsPlugins/vcsGit/git.py Fri Oct 25 09:47:48 2024 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/git.py Fri Oct 25 17:58:59 2024 +0200
@@ -289,7 +289,7 @@
args = self.initCommand("init")
args.append(projectDir)
- dia = GitDialog(self.tr("Creating Git repository"), self)
+ dia = GitDialog(self.tr("Creating Git repository"), git=self, parent=self.__ui)
res = dia.startProcess(args)
if res:
dia.exec()
@@ -304,7 +304,11 @@
args = self.initCommand("add")
args.append("-v")
args.append(".")
- dia = GitDialog(self.tr("Adding files to Git repository"), self)
+ dia = GitDialog(
+ self.tr("Adding files to Git repository"),
+ git=self,
+ parent=self.__ui,
+ )
res = dia.startProcess(args, projectDir)
if res:
dia.exec()
@@ -313,7 +317,11 @@
if status:
args = self.initCommand("commit")
args.append("--message={0}".format(msg))
- dia = GitDialog(self.tr("Initial commit to Git repository"), self)
+ dia = GitDialog(
+ self.tr("Initial commit to Git repository"),
+ git=self,
+ parent=self.__ui,
+ )
res = dia.startProcess(args, projectDir)
if res:
dia.exec()
@@ -345,7 +353,11 @@
if noDialog:
return self.startSynchronizedProcess(QProcess(), "git", args)
else:
- dia = GitDialog(self.tr("Cloning project from a Git repository"), self)
+ dia = GitDialog(
+ self.tr("Cloning project from a Git repository"),
+ git=self,
+ parent=self.__ui,
+ )
res = dia.startProcess(args)
if res:
dia.exec()
@@ -502,7 +514,11 @@
if noDialog:
self.startSynchronizedProcess(QProcess(), "git", args, dname)
else:
- dia = GitDialog(self.tr("Committing changes to Git repository"), self)
+ dia = GitDialog(
+ self.tr("Committing changes to Git repository"),
+ git=self,
+ parent=self.__ui,
+ )
res = dia.startProcess(args, dname)
if res:
dia.exec()
@@ -594,7 +610,11 @@
self.startSynchronizedProcess(QProcess(), "git", args, repodir)
res = False
else:
- dia = GitDialog(self.tr("Synchronizing with the Git repository"), self)
+ dia = GitDialog(
+ self.tr("Synchronizing with the Git repository"),
+ git=self,
+ parent=self.__ui,
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -641,7 +661,9 @@
self.startSynchronizedProcess(QProcess(), "git", args, repodir)
else:
dia = GitDialog(
- self.tr("Adding files/directories to the Git repository"), self
+ self.tr("Adding files/directories to the Git repository"),
+ git=self,
+ parent=self.__ui,
)
res = dia.startProcess(args, repodir)
if res:
@@ -718,7 +740,9 @@
res = self.startSynchronizedProcess(QProcess(), "git", args, repodir)
else:
dia = GitDialog(
- self.tr("Removing files/directories from the Git repository"), self
+ self.tr("Removing files/directories from the Git repository"),
+ git=self,
+ parent=self.__ui,
)
res = dia.startProcess(args, repodir)
if res:
@@ -764,7 +788,7 @@
force = True
accepted = True
else:
- dlg = GitCopyDialog(name, None, True)
+ dlg = GitCopyDialog(name, parent=self.__ui, move=True)
accepted = dlg.exec() == QDialog.DialogCode.Accepted
if accepted:
target, force = dlg.getData()
@@ -786,7 +810,9 @@
if noDialog:
res = self.startSynchronizedProcess(QProcess(), "git", args, repodir)
else:
- dia = GitDialog(self.tr("Renaming {0}").format(name), self)
+ dia = GitDialog(
+ self.tr("Renaming {0}").format(name), git=self, parent=self.__ui
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -912,7 +938,9 @@
else:
args.append(name)
- dia = GitDialog(self.tr("Unstage files/directories"), self)
+ dia = GitDialog(
+ self.tr("Unstage files/directories"), git=self, parent=self.__ui
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -972,7 +1000,7 @@
),
)
if yes:
- dia = GitDialog(self.tr("Reverting changes"), self)
+ dia = GitDialog(self.tr("Reverting changes"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -1004,6 +1032,7 @@
self.gitGetBranchesList(repodir),
self.gitGetCurrentBranch(repodir),
self.gitGetBranchesList(repodir, remotes=True),
+ parent=self.__ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
commit, doCommit, commitMessage, addLog, diffStat = dlg.getParameters()
@@ -1025,7 +1054,7 @@
if commit:
args.append(commit)
- dia = GitDialog(self.tr("Merging").format(name), self)
+ dia = GitDialog(self.tr("Merging").format(name), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -1055,6 +1084,7 @@
self.gitGetBranchesList(repodir),
trackingBranchesList=self.gitGetBranchesList(repodir, remotes=True),
noneLabel=self.tr("Main branch head"),
+ parent=self.__ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
rev = dlg.getRevision()
@@ -1263,7 +1293,7 @@
"""
from .GitCommandDialog import GitCommandDialog
- dlg = GitCommandDialog(self.commandHistory, name)
+ dlg = GitCommandDialog(self.commandHistory, name, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
command = dlg.getData()
commandList = Utilities.parseOptionString(command)
@@ -1282,7 +1312,7 @@
if not repodir:
return
- dia = GitDialog(self.tr("Git Command"), self)
+ dia = GitDialog(self.tr("Git Command"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -1560,7 +1590,7 @@
"""
from .GitCopyDialog import GitCopyDialog
- dlg = GitCopyDialog(name)
+ dlg = GitCopyDialog(name, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
target, force = dlg.getData()
@@ -1658,7 +1688,9 @@
return
dlg = GitRevisionsSelectionDialog(
- self.gitGetTagsList(repodir), self.gitGetBranchesList(repodir)
+ self.gitGetTagsList(repodir),
+ self.gitGetBranchesList(repodir),
+ parent=self.__ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
revisions = dlg.getRevisions()
@@ -1749,7 +1781,9 @@
return
dlg = GitRevisionsSelectionDialog(
- self.gitGetTagsList(repodir), self.gitGetBranchesList(repodir)
+ self.gitGetTagsList(repodir),
+ self.gitGetBranchesList(repodir),
+ parent=self.__ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
rev1, rev2 = dlg.getRevisions()
@@ -1812,7 +1846,7 @@
if not repodir:
return
- dlg = GitFetchDialog(self, repodir)
+ dlg = GitFetchDialog(self, repodir, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
(
remote,
@@ -1839,7 +1873,11 @@
else:
args.extend(remoteBranches)
- dia = GitDialog(self.tr("Fetching from a remote Git repository"), self)
+ dia = GitDialog(
+ self.tr("Fetching from a remote Git repository"),
+ git=self,
+ parent=self.__ui,
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -1861,7 +1899,7 @@
if not repodir:
return False
- dlg = GitPullDialog(self, repodir)
+ dlg = GitPullDialog(self, repodir, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
remote, url, branches, pullAll, prune = dlg.getData()
@@ -1876,7 +1914,11 @@
args.append(remote) if remote else args.append(url)
args.extend(branches)
- dia = GitDialog(self.tr("Pulling from a remote Git repository"), self)
+ dia = GitDialog(
+ self.tr("Pulling from a remote Git repository"),
+ git=self,
+ parent=self.__ui,
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -1900,7 +1942,7 @@
if not repodir:
return
- dlg = GitPushDialog(self, repodir)
+ dlg = GitPushDialog(self, repodir, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
remote, refspecs, tags, tracking, submodule = dlg.getData()
@@ -1916,7 +1958,11 @@
args.append(remote)
args.extend(refspecs)
- dia = GitDialog(self.tr("Pushing to a remote Git repository"), self)
+ dia = GitDialog(
+ self.tr("Pushing to a remote Git repository"),
+ git=self,
+ parent=self.__ui,
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -1945,7 +1991,7 @@
args = self.initCommand("commit")
- dia = GitDialog(self.tr("Committing failed merge"), self)
+ dia = GitDialog(self.tr("Committing failed merge"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir, environment=env)
if res:
dia.exec()
@@ -1971,7 +2017,9 @@
args = self.initCommand("merge")
args.append("--abort")
- dia = GitDialog(self.tr("Aborting uncommitted/failed merge"), self)
+ dia = GitDialog(
+ self.tr("Aborting uncommitted/failed merge"), git=self, parent=self.__ui
+ )
res = dia.startProcess(args, repodir, False)
if res:
dia.exec()
@@ -2005,7 +2053,7 @@
if noDialog:
self.startSynchronizedProcess(QProcess(), "git", args, repodir)
else:
- dia = GitDialog(self.tr("Applying patch"), self)
+ dia = GitDialog(self.tr("Applying patch"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -2027,7 +2075,7 @@
if not repodir:
return
- dlg = GitPatchFilesDialog(repodir, self.__patchCheckData)
+ dlg = GitPatchFilesDialog(repodir, self.__patchCheckData, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
patchFilesList, stripCount, inaccurateEof, recount = dlg.getData()
if patchFilesList:
@@ -2051,7 +2099,7 @@
args.append("-p{0}".format(stripCount))
args.extend(patchFilesList)
- dia = GitDialog(title, self)
+ dia = GitDialog(title, git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -2100,7 +2148,9 @@
if not repodir:
return False
- dlg = GitTagDialog(self.gitGetTagsList(repodir), revision, tagName)
+ dlg = GitTagDialog(
+ self.gitGetTagsList(repodir), revision, tagName, parent=self.__ui
+ )
if dlg.exec() == QDialog.DialogCode.Accepted:
tag, revision, tagOp, tagType, force = dlg.getParameters()
else:
@@ -2127,7 +2177,9 @@
if tagOp == GitTagOperation.Create and revision:
args.append(revision)
- dia = GitDialog(self.tr("Tagging in the Git repository"), self)
+ dia = GitDialog(
+ self.tr("Tagging in the Git repository"), git=self, parent=self.__ui
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -2319,6 +2371,7 @@
revision,
branchName,
branchOp,
+ parent=self.__ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
(
@@ -2386,7 +2439,9 @@
else:
return False, False
- dia = GitDialog(self.tr("Branching in the Git repository"), self)
+ dia = GitDialog(
+ self.tr("Branching in the Git repository"), git=self, parent=self.__ui
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -2421,6 +2476,7 @@
self.gitGetBranchesList(repodir),
self.gitGetRemotesList(repodir),
delete=True,
+ parent=self.__ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
branchName, remoteName = dlg.getData()[:2]
@@ -2429,7 +2485,7 @@
args.append(remoteName)
args.append(":{0}".format(branchName))
- dia = GitDialog(self.tr("Delete Remote Branch"), self)
+ dia = GitDialog(self.tr("Delete Remote Branch"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -2474,7 +2530,9 @@
return
dlg = GitBundleDialog(
- self.gitGetTagsList(repodir), self.gitGetBranchesList(repodir)
+ self.gitGetTagsList(repodir),
+ self.gitGetBranchesList(repodir),
+ parent=self.__ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
revs = dlg.getData()
@@ -2517,7 +2575,7 @@
for rev in revs:
args.append(rev)
- dia = GitDialog(self.tr("Create Bundle"), self)
+ dia = GitDialog(self.tr("Create Bundle"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -2547,7 +2605,7 @@
args.append("verify")
args.append(fname)
- dia = GitDialog(self.tr("Verify Bundle"), self)
+ dia = GitDialog(self.tr("Verify Bundle"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -2577,7 +2635,7 @@
args.append("list-heads")
args.append(fname)
- dia = GitDialog(self.tr("List Bundle Heads"), self)
+ dia = GitDialog(self.tr("List Bundle Heads"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -2644,7 +2702,9 @@
self.__lastBundlePath = os.path.dirname(fname)
dlg = GitApplyBundleDataDialog(
- self.gitGetBundleHeads(repodir, fname), self.gitGetBranchesList(repodir)
+ self.gitGetBundleHeads(repodir, fname),
+ self.gitGetBranchesList(repodir),
+ parent=self.__ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
bundleHead, branch = dlg.getData()
@@ -2657,7 +2717,11 @@
else:
args.append(bundleHead)
- dia = GitDialog(self.tr("Applying a bundle file (fetch)"), self)
+ dia = GitDialog(
+ self.tr("Applying a bundle file (fetch)"),
+ git=self,
+ parent=self.__ui,
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -2692,7 +2756,9 @@
self.__lastBundlePath = os.path.dirname(fname)
dlg = GitApplyBundleDataDialog(
- self.gitGetBundleHeads(repodir, fname), self.gitGetBranchesList(repodir)
+ self.gitGetBundleHeads(repodir, fname),
+ self.gitGetBranchesList(repodir),
+ parent=self.__ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
bundleHead, branch = dlg.getData()
@@ -2705,7 +2771,11 @@
else:
args.append(bundleHead)
- dia = GitDialog(self.tr("Applying a bundle file (fetch)"), self)
+ dia = GitDialog(
+ self.tr("Applying a bundle file (fetch)"),
+ git=self,
+ parent=self.__ui,
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -2761,6 +2831,7 @@
self.gitGetBranchesList(repodir),
showBranches=showBranches,
showHead=showHead,
+ parent=self.__ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
rev = dlg.getRevision()
@@ -2769,7 +2840,7 @@
args = self.initCommand("bisect")
if subcommand == "start_extended":
- dlg = GitBisectStartDialog()
+ dlg = GitBisectStartDialog(parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
bad, good, noCheckout = dlg.getData()
args.append("start")
@@ -2786,7 +2857,11 @@
args.extend(rev.split())
# treat rev as a list separated by whitespace
- dia = GitDialog(self.tr("Git Bisect ({0})").format(subcommand), self)
+ dia = GitDialog(
+ self.tr("Git Bisect ({0})").format(subcommand),
+ git=self,
+ parent=self.__ui,
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -2946,7 +3021,11 @@
args.append("replay")
args.append(fname)
- dia = GitDialog(self.tr("Git Bisect ({0})").format("replay"), self)
+ dia = GitDialog(
+ self.tr("Git Bisect ({0})").format("replay"),
+ git=self,
+ parent=self.__ui,
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -3118,7 +3197,7 @@
args.append("show")
args.append(remoteName)
- dia = GitDialog(self.tr("Show Remote Info"), self)
+ dia = GitDialog(self.tr("Show Remote Info"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir, showArgs=False)
if res:
dia.exec()
@@ -3152,7 +3231,7 @@
if not repodir:
return
- dlg = GitAddRemoteDialog()
+ dlg = GitAddRemoteDialog(parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
name, url = dlg.getData()
args = self.initCommand("remote")
@@ -3211,7 +3290,7 @@
if not remoteUrl:
remoteUrl = self.gitGetRemoteUrl(repodir, remoteName)
- dlg = GitChangeRemoteUrlDialog(remoteName, remoteUrl)
+ dlg = GitChangeRemoteUrlDialog(remoteName, remoteUrl, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
name, url = dlg.getData()
if url != remoteUrl:
@@ -3245,7 +3324,7 @@
if not remoteUrl:
remoteUrl = self.gitGetRemoteUrl(repodir, remoteName)
- dlg = GitRemoteCredentialsDialog(remoteName, remoteUrl)
+ dlg = GitRemoteCredentialsDialog(remoteName, remoteUrl, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
name, url = dlg.getData()
if url != remoteUrl:
@@ -3296,7 +3375,7 @@
args.append("prune")
args.append(remoteName)
- dia = GitDialog(self.tr("Show Remote Info"), self)
+ dia = GitDialog(self.tr("Show Remote Info"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -3320,7 +3399,7 @@
args.append("-w")
args.append(commit)
- dia = GitDialog(self.tr("Show Shortlog"), self)
+ dia = GitDialog(self.tr("Show Shortlog"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir, showArgs=False)
if res:
dia.exec()
@@ -3367,7 +3446,7 @@
res = False
- dlg = GitCherryPickDialog(commits)
+ dlg = GitCherryPickDialog(commits, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
commits, cherrypickInfo, signoff, nocommit = dlg.getData()
@@ -3381,7 +3460,7 @@
args.append("--no-commit")
args.extend(commits)
- dia = GitDialog(self.tr("Cherry-pick"), self)
+ dia = GitDialog(self.tr("Cherry-pick"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -3414,7 +3493,9 @@
args = self.initCommand("cherry-pick")
args.append("--continue")
- dia = GitDialog(self.tr("Copy Changesets (Continue)"), self)
+ dia = GitDialog(
+ self.tr("Copy Changesets (Continue)"), git=self, parent=self.__ui
+ )
res = dia.startProcess(args, repodir, environment=env)
if res:
dia.exec()
@@ -3439,7 +3520,7 @@
args = self.initCommand("cherry-pick")
args.append("--quit")
- dia = GitDialog(self.tr("Copy Changesets (Quit)"), self)
+ dia = GitDialog(self.tr("Copy Changesets (Quit)"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -3465,7 +3546,7 @@
args = self.initCommand("cherry-pick")
args.append("--abort")
- dia = GitDialog(self.tr("Copy Changesets (Cancel)"), self)
+ dia = GitDialog(self.tr("Copy Changesets (Cancel)"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -3532,7 +3613,7 @@
return False
res = False
- dlg = GitStashDataDialog()
+ dlg = GitStashDataDialog(parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
message, keepIndex, untracked = dlg.getData()
args = self.initCommand("stash")
@@ -3546,7 +3627,7 @@
if message:
args.append(message)
- dia = GitDialog(self.tr("Saving stash"), self)
+ dia = GitDialog(self.tr("Saving stash"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -3638,7 +3719,7 @@
if stashName:
args.append(stashName)
- dia = GitDialog(self.tr("Restoring stash"), self)
+ dia = GitDialog(self.tr("Restoring stash"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -3680,7 +3761,7 @@
if stashName:
args.append(stashName)
- dia = GitDialog(self.tr("Restoring stash"), self)
+ dia = GitDialog(self.tr("Restoring stash"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -3732,7 +3813,7 @@
if stashName:
args.append(stashName)
- dia = GitDialog(self.tr("Creating branch"), self)
+ dia = GitDialog(self.tr("Creating branch"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -3782,7 +3863,7 @@
if stashName:
args.append(stashName)
- dia = GitDialog(self.tr("Deleting stash"), self)
+ dia = GitDialog(self.tr("Deleting stash"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -3811,7 +3892,7 @@
args = self.initCommand("stash")
args.append("clear")
- dia = GitDialog(self.tr("Deleting all stashes"), self)
+ dia = GitDialog(self.tr("Deleting all stashes"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -3846,7 +3927,7 @@
cfgFile = getConfigPath()
if not os.path.exists(cfgFile):
- dlg = GitUserConfigDataDialog()
+ dlg = GitUserConfigDataDialog(parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
firstName, lastName, email = dlg.getData()
else:
@@ -3873,7 +3954,11 @@
args = self.initCommand("config")
args.append("--list")
- dia = GitDialog(self.tr("Showing the combined configuration settings"), self)
+ dia = GitDialog(
+ self.tr("Showing the combined configuration settings"),
+ git=self,
+ parent=self.__ui,
+ )
res = dia.startProcess(args, repodir, False)
if res:
dia.exec()
@@ -3896,7 +3981,11 @@
args.append("--full")
args.append("--cache")
- dia = GitDialog(self.tr("Verifying the integrity of the Git repository"), self)
+ dia = GitDialog(
+ self.tr("Verifying the integrity of the Git repository"),
+ git=self,
+ parent=self.__ui,
+ )
res = dia.startProcess(args, repodir, False)
if res:
dia.exec()
@@ -3918,7 +4007,9 @@
if self.__plugin.getPreferences("AggressiveGC"):
args.append("--aggressive")
- dia = GitDialog(self.tr("Performing Repository Housekeeping"), self)
+ dia = GitDialog(
+ self.tr("Performing Repository Housekeeping"), git=self, parent=self.__ui
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -4009,7 +4100,7 @@
info.append("""</table></p>""")
else:
info.append(self.tr("<p><b>No statistics available.</b></p>"))
- dlg = VcsRepositoryInfoDialog(None, "\n".join(info))
+ dlg = VcsRepositoryInfoDialog(self.__ui, "\n".join(info))
dlg.exec()
def gitGetArchiveFormats(self, repodir):
@@ -4064,6 +4155,7 @@
self.gitGetTagsList(repodir),
self.gitGetBranchesList(repodir),
self.gitGetArchiveFormats(repodir),
+ parent=self.__ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
commit, archiveFormat, fileName, prefix = dlg.getData()
@@ -4077,7 +4169,7 @@
args.append("--prefix={0}".format(prefix))
args.append(commit)
- dia = GitDialog(self.tr("Creating Archive"), self)
+ dia = GitDialog(self.tr("Creating Archive"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -4100,7 +4192,7 @@
if not repodir:
return
- dlg = GitSubmoduleAddDialog(self, repodir)
+ dlg = GitSubmoduleAddDialog(self, repodir, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
repo, branch, name, path, force = dlg.getData()
args = self.initCommand("submodule")
@@ -4117,7 +4209,7 @@
if path:
args.append(path)
- dia = GitDialog(self.tr("Add Submodule"), self)
+ dia = GitDialog(self.tr("Add Submodule"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -4178,7 +4270,7 @@
submodulesList = self.__gitSubmodulesList(repodir)
if submodulesList:
- dlg = GitSubmodulesListDialog(submodulesList)
+ dlg = GitSubmodulesListDialog(submodulesList, parent=self.__ui)
dlg.exec()
else:
EricMessageBox.information(
@@ -4226,7 +4318,7 @@
paths = [submodule["path"] for submodule in self.__gitSubmodulesList(repodir)]
- dlg = GitListDialog(sorted(paths))
+ dlg = GitListDialog(sorted(paths), parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
selectedPaths = dlg.getSelection()
return selectedPaths, True
@@ -4251,7 +4343,9 @@
args.append("init")
args.extend(submodulePaths)
- dia = GitDialog(self.tr("Initialize Submodules"), self)
+ dia = GitDialog(
+ self.tr("Initialize Submodules"), git=self, parent=self.__ui
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -4272,7 +4366,7 @@
paths = [submodule["path"] for submodule in self.__gitSubmodulesList(repodir)]
- dlg = GitSubmodulesDeinitDialog(paths)
+ dlg = GitSubmodulesDeinitDialog(paths, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
deinitAll, submodulePaths, force = dlg.getData()
args = self.initCommand("submodule")
@@ -4284,7 +4378,9 @@
if force:
args.append("--force")
- dia = GitDialog(self.tr("Unregister Submodules"), self)
+ dia = GitDialog(
+ self.tr("Unregister Submodules"), git=self, parent=self.__ui
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -4315,7 +4411,7 @@
args.append("--remote")
args.extend(submodulePaths)
- dia = GitDialog(self.tr("Update Submodules"), self)
+ dia = GitDialog(self.tr("Update Submodules"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -4337,7 +4433,7 @@
paths = [submodule["path"] for submodule in self.__gitSubmodulesList(repodir)]
- dlg = GitSubmodulesUpdateOptionsDialog(paths)
+ dlg = GitSubmodulesUpdateOptionsDialog(paths, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
procedure, init, remote, noFetch, force, submodulePaths = dlg.getData()
@@ -4354,7 +4450,7 @@
args.append("--force")
args.extend(submodulePaths)
- dia = GitDialog(self.tr("Update Submodules"), self)
+ dia = GitDialog(self.tr("Update Submodules"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -4375,7 +4471,7 @@
paths = [submodule["path"] for submodule in self.__gitSubmodulesList(repodir)]
- dlg = GitSubmodulesSyncDialog(paths)
+ dlg = GitSubmodulesSyncDialog(paths, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
submodulePaths, recursive = dlg.getData()
args = self.initCommand("submodule")
@@ -4384,7 +4480,9 @@
args.append("--recursive")
args.extend(submodulePaths)
- dia = GitDialog(self.tr("Synchronize Submodules"), self)
+ dia = GitDialog(
+ self.tr("Synchronize Submodules"), git=self, parent=self.__ui
+ )
res = dia.startProcess(args, repodir)
if res:
dia.exec()
@@ -4420,7 +4518,7 @@
paths = [submodule["path"] for submodule in self.__gitSubmodulesList(repodir)]
- dlg = GitSubmodulesSummaryOptionsDialog(paths)
+ dlg = GitSubmodulesSummaryOptionsDialog(paths, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
submodulePaths, superProject, index, commit, limit = dlg.getData()
args = self.initCommand("submodule")
@@ -4438,7 +4536,7 @@
args.append("--")
args.extend(submodulePaths)
- dia = GitDialog(self.tr("Submodules Summary"), self)
+ dia = GitDialog(self.tr("Submodules Summary"), git=self, parent=self.__ui)
res = dia.startProcess(args, repodir)
if res:
dia.exec()
