eric: comparison eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py

-:dd54d33d21d2
+:51aa6c6b66f7
 locker.unlock()
 if not noDialog:
 rev and dlg.showMessage(self.tr("Imported revision {0}.\n")
 .format(rev.number))
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 os.chdir(cwd)
 shutil.rmtree(tmpDir, True)
 return status, False
 if not noDialog:
 dlg.showError(e.args[0])
 locker.unlock()
 if not noDialog:
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 return status
 def vcsExport(self, vcsDataDict, projectDir):
 """
 Public method used to export a directory from the Subversion
 except pysvn.ClientError as e:
 status = False
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 return status
 def vcsCommit(self, name, message, noDialog=False):
 """
 Public method used to make the change of a file/directory permanent
 locker.unlock()
 if not noDialog:
 rev and dlg.showMessage(self.tr("Committed revision {0}.")
 .format(rev.number))
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 os.chdir(cwd)
 self.committed.emit()
 self.checkVCSStatus()
 def vcsUpdate(self, name, noDialog=False):
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 if not noDialog:
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 res = dlg.hasAddOrDelete()
 else:
 res = False
 os.chdir(cwd)
 self.checkVCSStatus()
 if not noDialog:
 dlg.showError(e.args[0])
 locker.unlock()
 if not noDialog:
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 os.chdir(cwd)
 def vcsAddBinary(self, name, isDir=False):
 """
 Public method used to add a file/directory in binary mode to the
 client.add(names, recurse=recurse, force=force, ignore=ignore)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 os.chdir(cwd)
 def vcsRemove(self, name, project=False, noDialog=False):
 """
 Public method used to remove a file/directory from the Subversion
 if not noDialog:
 dlg.showError(e.args[0])
 locker.unlock()
 if not noDialog:
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 return res
 def vcsMove(self, name, project, target=None, noDialog=False):
 """
 force = True
 accepted = True
 else:
 from .SvnCopyDialog import SvnCopyDialog
 dlg = SvnCopyDialog(name, None, True, "--force" in opts)
-accepted = (dlg.exec_() == QDialog.Accepted)
+accepted = (dlg.exec() == QDialog.Accepted)
 if accepted:
 target, force = dlg.getData()
 if not target:
 return False
 if not noDialog:
 dlg.showError(e.args[0])
 locker.unlock()
 if not noDialog:
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 if res and not rx_prot.exactMatch(target):
 if target.startswith(project.getProjectPath()):
 if isDir:
 project.moveDirectory(name, target)
 else:
 else:
 url = self.svnNormalizeURL(reposURL)
 from .SvnTagDialog import SvnTagDialog
 dlg = SvnTagDialog(self.allTagsBranchesList, url,
 self.otherData["standardLayout"])
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 tag, tagOp = dlg.getParameters()
 if tag in self.allTagsBranchesList:
 self.allTagsBranchesList.remove(tag)
 self.allTagsBranchesList.insert(0, tag)
 else:
 dlg.showError(e.args[0])
 locker.unlock()
 rev and dlg.showMessage(
 self.tr("Revision {0}.\n").format(rev.number))
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 def vcsRevert(self, name):
 """
 Public method used to revert changes made to a file/directory.
 self.tr("Revert changes"),
 self.tr(
 "Do you really want to revert all changes to these files"
 " or directories?"),
 name)
-yes = dia.exec_() == QDialog.Accepted
+yes = dia.exec() == QDialog.Accepted
 else:
 yes = E5MessageBox.yesNo(
 None,
 self.tr("Revert changes"),
 self.tr("""Do you really want to revert all changes of"""
 client.revert(name, recurse)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 self.checkVCSStatus()
 def vcsSwitch(self, name):
 """
 Public method used to switch a directory to a different tag/branch.
 else:
 url = self.svnNormalizeURL(reposURL)
 from .SvnSwitchDialog import SvnSwitchDialog
 dlg = SvnSwitchDialog(self.allTagsBranchesList, url,
 self.otherData["standardLayout"])
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 tag, tagType = dlg.getParameters()
 if tag in self.allTagsBranchesList:
 self.allTagsBranchesList.remove(tag)
 self.allTagsBranchesList.insert(0, tag)
 else:
 dlg.showMessage(self.tr("Revision {0}.\n").format(rev.number))
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 res = dlg.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def vcsMerge(self, name):
 opts = self.options['global']
 from .SvnMergeDialog import SvnMergeDialog
 dlg = SvnMergeDialog(self.mergeList[0], self.mergeList[1],
 self.mergeList[2], "--force" in opts)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 urlrev1, urlrev2, target, force = dlg.getParameters()
 else:
 return
 # remember URL or revision
 recurse=recurse, force=force)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 os.chdir(cwd)
 def vcsRegisteredState(self, name):
 """
 Public method used to get the registered state of a file in the vcs.
 client.cleanup(name)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 def vcsCommandLine(self, name):
 """
 Public method used to execute arbitrary subversion commands.
 @param name directory name of the working directory (string)
 """
 from .SvnCommandDialog import SvnCommandDialog
 dlg = SvnCommandDialog(self.commandHistory, self.wdHistory, name)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 command, wd = dlg.getData()
 commandList = Utilities.parseOptionString(command)
 # This moves any previous occurrence of these arguments to the head
 # of the list.
 SvnDialog as SvnProcessDialog
 )
 dia = SvnProcessDialog(self.tr('Subversion command'))
 res = dia.startProcess(args, wd)
 if res:
-dia.exec_()
+dia.exec()
 def vcsOptionsDialog(self, project, archive, editable=False, parent=None):
 """
 Public method to get a dialog to enter repository info.
 client.resolved(name, recurse=recurse)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 os.chdir(cwd)
 self.checkVCSStatus()
 def svnCopy(self, name, project):
 """
 """
 from .SvnCopyDialog import SvnCopyDialog
 rx_prot = QRegExp('(file:|svn:|svn+ssh:|http:|https:).+')
 dlg = SvnCopyDialog(name)
 res = False
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 target, force = dlg.getData()
 client = self.getClient()
 if rx_prot.exactMatch(target):
 target = self.__svnURL(target)
 except pysvn.ClientError as e:
 res = False
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 if (
 res and
 not rx_prot.exactMatch(target) and
 target.startswith(project.getProjectPath())
 ):
 @param name file/directory name (string or list of strings)
 @param recursive flag indicating a recursive set is requested
 """
 from .SvnPropSetDialog import SvnPropSetDialog
 dlg = SvnPropSetDialog(recursive)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 propName, propValue, recurse = dlg.getData()
 if not propName:
 E5MessageBox.critical(
 self.__ui,
 self.tr("Subversion Set Property"),
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.showMessage(self.tr("Property set."))
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 os.chdir(cwd)
 def svnDelProp(self, name, recursive=False):
 """
 Public method used to delete a property of a file/directory.
 @param name file/directory name (string or list of strings)
 @param recursive flag indicating a recursive list is requested
 """
 from .SvnPropDelDialog import SvnPropDelDialog
 dlg = SvnPropDelDialog(recursive)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 propName, recurse = dlg.getData()
 if not propName:
 E5MessageBox.critical(
 self.__ui,
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.showMessage(self.tr("Property deleted."))
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 os.chdir(cwd)
 def svnListTagBranch(self, path, tags=True):
 """
 Public method used to list the available tags or branches.
 project = e5App().getObject("Project")
 if nam == project.ppath and not project.saveAllScripts():
 return
 from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog
 dlg = SvnRevisionSelectionDialog()
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 revisions = dlg.getRevisions()
 if self.diff is None:
 from .SvnDiffDialog import SvnDiffDialog
 self.diff = SvnDiffDialog(self)
 self.diff.show()
 dname = self.splitPath(names[0])[0]
 from .SvnUrlSelectionDialog import SvnUrlSelectionDialog
 dlg = SvnUrlSelectionDialog(self, self.tagsList, self.branchesList,
 dname)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 urls, summary = dlg.getURLs()
 if self.diff is None:
 from .SvnDiffDialog import SvnDiffDialog
 self.diff = SvnDiffDialog(self)
 self.diff.show()
 raise ValueError("Wrong parameter type")
 if extended:
 from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog
 dlg = SvnRevisionSelectionDialog()
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 rev1, rev2 = dlg.getRevisions()
 if rev1 == "WORKING":
 rev1 = ""
 if rev2 == "WORKING":
 rev2 = ""
 dlg.showError(e.args[0])
 except AttributeError as e:
 dlg.showError(str(e))
 locker.unlock()
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 os.chdir(cwd)
 def svnUnlock(self, name, breakIt=False, parent=None):
 """
 Public method used to unlock a file in the Subversion repository.
 dlg.showError(e.args[0])
 except AttributeError as e:
 dlg.showError(str(e))
 locker.unlock()
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 os.chdir(cwd)
 def svnInfo(self, projectPath, name):
 """
 Public method to show repository information about a file or directory.
 @param name file/directory name relative to the project (string)
 """
 from .SvnInfoDialog import SvnInfoDialog
 dlg = SvnInfoDialog(self)
 dlg.start(projectPath, name)
-dlg.exec_()
+dlg.exec()
 def svnRelocate(self, projectPath):
 """
 Public method to relocate the working copy to a new repository URL.
 @param projectPath path name of the project (string)
 """
 from .SvnRelocateDialog import SvnRelocateDialog
 currUrl = self.svnGetReposName(projectPath)
 dlg = SvnRelocateDialog(currUrl)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 newUrl, inside = dlg.getData()
 if inside:
 msg = "switch {0} {1}".format(newUrl, projectPath)
 else:
 msg = "relocate {0} {1} {2}".format(currUrl, newUrl,
 client.relocate(currUrl, newUrl, projectPath, recurse=True)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 def svnRepoBrowser(self, projectPath=None):
 """
 Public method to open the repository browser.
 client.remove_from_changelists(name)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 def svnAddToChangelist(self, names):
 """
 Public method to add a file or directory to a changelist.
 depth=pysvn.depth.infinity)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 def svnShowChangelists(self, path):
 """
 Public method used to inspect the change lists defined for the project.
 client.upgrade(path)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
-dlg.exec_()
+dlg.exec()
 ###########################################################################
 ## Private Subversion specific methods are below.
 ###########################################################################

Mercurial Repositories > eric / file comparison

comparison: eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py

eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py