eric: comparison src/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py

-:b918c6c2736b
+:a671918232f3
 self.tr("Importing project into Subversion repository"),
 "import{0} --message {1} .".format(
 (not recurse) and " --non-recursive" or "", msg
 ),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 rev = client.import_(".", url, msg, recurse, ignore=True)
 self.tr("Checking project out of Subversion repository"),
 "checkout{0} {1} {2}".format(
 (not recurse) and " --non-recursive" or "", url, projectDir
 ),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 client.checkout(url, projectDir, recurse)
 self.tr("Exporting project from Subversion repository"),
 "export --force{0} {1} {2}".format(
 (not recurse) and " --non-recursive" or "", url, projectDir
 ),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 client.export(url, projectDir, force=True, recurse=recurse)
 changelists and " --changelist ".join([""] + changelists) or "",
 msg,
 " ".join(fnames),
 ),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 rev = (
 self.tr("Synchronizing with the Subversion repository"),
 "update{0} {1}".format(
 (not recurse) and " --non-recursive" or "", " ".join(fnames)
 ),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 client.update(fnames, recurse)
 force and " --force" or "",
 noignore and " --no-ignore" or "",
 " ".join(names),
 ),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 client.add(names, recurse=recurse, force=force, ignore=not noignore)
 force and " --force" or "",
 ignore and " --ignore" or "",
 " ".join(names),
 ),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 client.add(names, recurse=recurse, force=force, ignore=ignore)
 if not noDialog:
 dlg = SvnDialog(
 self.tr("Removing files/directories from the Subversion repository"),
 "remove{0} {1}".format(force and " --force" or "", " ".join(name)),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 client.remove(name, force=force)
 if target is None:
 return False
 force = True
 accepted = True
 else:
-dlg = SvnCopyDialog(name, None, True, "--force" in opts)
+dlg = SvnCopyDialog(
+name, parent=self.__ui, move=True, force="--force" in opts
+)
 accepted = dlg.exec() == QDialog.DialogCode.Accepted
 if accepted:
 target, force = dlg.getData()
 if not target:
 return False
 log and (" --message {0}".format(log)) or "",
 name,
 target,
 ),
 client,
+parent=self.__ui,
 log=log,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 url = (
 None if self.otherData["standardLayout"] else self.svnNormalizeURL(reposURL)
 )
 dlg = SvnTagDialog(
-self.allTagsBranchesList, url, self.otherData["standardLayout"]
+self.allTagsBranchesList,
+url,
+self.otherData["standardLayout"],
+parent=self.__ui,
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 tag, tagOp = dlg.getParameters()
 if tag in self.allTagsBranchesList:
 self.allTagsBranchesList.remove(tag)
 log = "Created tag <{0}>".format(self.tagName)
 dlg = SvnDialog(
 self.tr("Tagging {0} in the Subversion repository").format(name),
 "copy --message {0} {1} {2}".format(log, reposURL, url),
 client,
+parent=self.__ui,
 log=log,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 log = "Deleted tag <{0}>".format(self.tagName)
 dlg = SvnDialog(
 self.tr("Tagging {0} in the Subversion repository").format(name),
 "remove --message {0} {1}".format(log, url),
 client,
+parent=self.__ui,
 log=log,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 self.tr("Reverting changes"),
 "revert {0} {1}".format(
 (not recurse) and " --non-recursive" or "", " ".join(name)
 ),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 client.revert(name, recurse)
 url = (
 None if self.otherData["standardLayout"] else self.svnNormalizeURL(reposURL)
 )
 dlg = SvnSwitchDialog(
-self.allTagsBranchesList, url, self.otherData["standardLayout"]
+self.allTagsBranchesList,
+url,
+self.otherData["standardLayout"],
+parent=self.__ui,
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 tag, tagType = dlg.getParameters()
 if tag in self.allTagsBranchesList:
 self.allTagsBranchesList.remove(tag)
 client = self.getClient()
 dlg = SvnDialog(
 self.tr("Switching to {0}").format(tn),
 "switch {0} {1}".format(url, name),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 rev = client.switch(name, url)
 dname, fname = self.splitPath(name)
 opts = self.options["global"]
 dlg = SvnMergeDialog(
-self.mergeList[0], self.mergeList[1], self.mergeList[2], "--force" in opts
+self.mergeList[0],
+self.mergeList[1],
+self.mergeList[2],
+"--force" in opts,
+parent=self.__ui,
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 urlrev1, urlrev2, target, force = dlg.getParameters()
 else:
 return
 "{0}{1}".format(url1, rev1 and ("@" + rev1) or ""),
 "{0}{1}".format(url2, rev2 and ("@" + rev2) or ""),
 fname,
 ),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 client.merge(
 @param name directory name to be cleaned up
 @type str
 """
 client = self.getClient()
 dlg = SvnDialog(
-self.tr("Cleaning up {0}").format(name), "cleanup {0}".format(name), client
+self.tr("Cleaning up {0}").format(name),
+"cleanup {0}".format(name),
+client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 client.cleanup(name)
 SvnDialog as SvnProcessDialog,
 )
 from .SvnCommandDialog import SvnCommandDialog
-dlg = SvnCommandDialog(self.commandHistory, self.wdHistory, name)
+dlg = SvnCommandDialog(
+self.commandHistory, self.wdHistory, name, parent=self.__ui
+)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 command, wd = dlg.getData()
 commandList = Utilities.parseOptionString(command)
 # This moves any previous occurrence of these arguments to the head
 self.wdHistory.insert(0, wd)
 args = []
 self.addArguments(args, commandList)
-dia = SvnProcessDialog(self.tr("Subversion command"))
+dia = SvnProcessDialog(self.tr("Subversion command"), parent=self.__ui)
 res = dia.startProcess(args, wd)
 if res:
 dia.exec()
 def vcsOptionsDialog(
 self.tr("Resolving conficts"),
 "resolved{0} {1}".format(
 (not recurse) and " --non-recursive" or "", " ".join(fnames)
 ),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 for name in fnames:
 @rtype bool
 """
 from .SvnCopyDialog import SvnCopyDialog
 rx_prot = re.compile("(file:|svn:|svn+ssh:|http:|https:).+")
-dlg = SvnCopyDialog(name)
+dlg = SvnCopyDialog(name, parent=self.__ui)
 res = False
 if dlg.exec() == QDialog.DialogCode.Accepted:
 target, force = dlg.getData()
 client = self.getClient()
 self.tr("Copying {0}").format(name),
 "copy{0} {1} {2}".format(
 log and (" --message {0}".format(log)) or "", name, target
 ),
 client,
+parent=self.__ui,
 log=log,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 @param recursive flag indicating a recursive set is requested
 @type bool
 """
 from .SvnPropSetDialog import SvnPropSetDialog
-dlg = SvnPropSetDialog(recursive)
+dlg = SvnPropSetDialog(recursive, parent=self.__ui)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 propName, propValue, recurse = dlg.getData()
 if not propName:
 EricMessageBox.critical(
 self.__ui,
 propName,
 propValue,
 " ".join(fnames),
 ),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 for name in fnames:
 @param recursive flag indicating a recursive list is requested
 @type bool
 """
 from .SvnPropDelDialog import SvnPropDelDialog
-dlg = SvnPropDelDialog(recursive)
+dlg = SvnPropDelDialog(recursive, parent=self.__ui)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 propName, recurse = dlg.getData()
 if not propName:
 EricMessageBox.critical(
 skipchecks and " --skip-checks" or "",
 propName,
 " ".join(fnames),
 ),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 for name in fnames:
 return
 else:
 project = ericApp().getObject("Project")
 if nam == project.ppath and not project.saveAllScripts():
 return
-dlg = SvnRevisionSelectionDialog()
+dlg = SvnRevisionSelectionDialog(parent=self.__ui)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 revisions = dlg.getRevisions()
 if self.diff is None:
 self.diff = SvnDiffDialog(self)
 self.diff.show()
 if nam == project.ppath and not project.saveAllScripts():
 return
 dname = self.splitPath(names[0])[0]
-dlg = SvnUrlSelectionDialog(self, self.tagsList, self.branchesList, dname)
+dlg = SvnUrlSelectionDialog(
+self, self.tagsList, self.branchesList, dname, parent=self.__ui
+)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 urls, summary = dlg.getURLs()
 if self.diff is None:
 self.diff = SvnDiffDialog(self)
 self.diff.show()
 if isinstance(name, list):
 raise ValueError("Wrong parameter type")
 if extended:
-dlg = SvnRevisionSelectionDialog()
+dlg = SvnRevisionSelectionDialog(parent=self.__ui)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 rev1, rev2 = dlg.getRevisions()
 if rev1 == "WORKING":
 rev1 = ""
 if rev2 == "WORKING":
 @param name file/directory name to be locked
 @type str or list of str
 @param stealIt flag indicating a forced operation
 @type bool
-@param parent reference to the parent object of the subversion dialog
+@param parent reference to the parent widget of the subversion dialog
 @type QWidget
 """
 comment, ok = QInputDialog.getText(
 None,
 self.tr("Subversion Lock"),
 @param name file/directory name to be unlocked
 @type str or list of str
 @param breakIt flag indicating a forced operation
 @type bool
-@param parent reference to the parent object of the subversion dialog
+@param parent reference to the parent widget of the subversion dialog
 @type QWidget
 """
 if isinstance(name, list):
 dname, fnames = self.splitPathList(name)
 else:
 @param name file/directory name relative to the project
 @type str
 """
 from .SvnInfoDialog import SvnInfoDialog
-dlg = SvnInfoDialog(self)
+dlg = SvnInfoDialog(self, parent=self.__ui)
 dlg.start(projectPath, name)
 dlg.exec()
 def svnRelocate(self, projectPath):
 """
 @type str
 """
 from .SvnRelocateDialog import SvnRelocateDialog
 currUrl = self.svnGetReposName(projectPath)
-dlg = SvnRelocateDialog(currUrl)
+dlg = SvnRelocateDialog(currUrl, parent=self.__ui)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 newUrl, inside = dlg.getData()
 if inside:
 msg = "switch {0} {1}".format(newUrl, projectPath)
 else:
 msg = "relocate {0} {1} {2}".format(currUrl, newUrl, projectPath)
 client = self.getClient()
-dlg = SvnDialog(self.tr("Relocating"), msg, client)
+dlg = SvnDialog(self.tr("Relocating"), msg, client, parent=self.__ui)
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 if inside:
 client.switch(projectPath, newUrl)
 client = self.getClient()
 dlg = SvnDialog(
 self.tr("Remove from changelist"),
 "changelist --remove {0}".format(" ".join(names)),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 for name in names:
 client = self.getClient()
 dlg = SvnDialog(
 self.tr("Add to changelist"),
 "changelist {0}".format(" ".join(names)),
 client,
+parent=self.__ui,
 )
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 for name in names:
 @param path directory name to show change lists for
 @type str
 """
 client = self.getClient()
-dlg = SvnDialog(self.tr("Upgrade"), "upgrade {0}".format(path), client)
+dlg = SvnDialog(
+self.tr("Upgrade"), "upgrade {0}".format(path), client, parent=self.__ui
+)
 QApplication.processEvents()
 try:
 with EricMutexLocker(self.vcsExecutionMutex):
 client.upgrade(path)
 except pysvn.ClientError as e:

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py

src/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py