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

-:dd54d33d21d2
+:51aa6c6b66f7
 else:
 dia = SvnDialog(
 self.tr('Importing project into Subversion repository'))
 res = dia.startProcess(args, os.path.join(tmpDir, project))
 if res:
-dia.exec_()
+dia.exec()
 status = dia.normalExit()
 shutil.rmtree(tmpDir, True)
 return status, False
 else:
 dia = SvnDialog(
 self.tr('Checking project out of Subversion repository'))
 res = dia.startProcess(args)
 if res:
-dia.exec_()
+dia.exec()
 return dia.normalExit()
 def vcsExport(self, vcsDataDict, projectDir):
 """
 Public method used to export a directory from the Subversion
 dia = SvnDialog(
 self.tr('Exporting project from Subversion repository'))
 res = dia.startProcess(args)
 if res:
-dia.exec_()
+dia.exec()
 return dia.normalExit()
 def vcsCommit(self, name, message, noDialog=False):
 """
 Public method used to make the change of a file/directory permanent
 else:
 dia = SvnDialog(
 self.tr('Commiting changes to Subversion repository'))
 res = dia.startProcess(args, dname)
 if res:
-dia.exec_()
+dia.exec()
 self.committed.emit()
 self.checkVCSStatus()
 def vcsUpdate(self, name, noDialog=False):
 """
 else:
 dia = SvnDialog(
 self.tr('Synchronizing with the Subversion repository'))
 res = dia.startProcess(args, dname, True)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def vcsAdd(self, name, isDir=False, noDialog=False):
 dia = SvnDialog(
 self.tr('Adding files/directories to the Subversion'
 ' repository'))
 res = dia.startProcess(args, wdir)
 if res:
-dia.exec_()
+dia.exec()
 def vcsAddBinary(self, name, isDir=False):
 """
 Public method used to add a file/directory in binary mode to the
 Subversion repository.
 dia = SvnDialog(
 self.tr('Adding directory trees to the Subversion repository'))
 res = dia.startProcess(args, dname)
 if res:
-dia.exec_()
+dia.exec()
 def vcsRemove(self, name, project=False, noDialog=False):
 """
 Public method used to remove a file/directory from the Subversion
 repository.
 dia = SvnDialog(
 self.tr('Removing files/directories from the Subversion'
 ' repository'))
 res = dia.startProcess(args)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.normalExit()
 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)
-accepted = (dlg.exec_() == QDialog.Accepted)
+accepted = (dlg.exec() == QDialog.Accepted)
 if accepted:
 target, force = dlg.getData()
 if not target:
 return False
 else:
 dia = SvnDialog(self.tr('Moving {0}')
 .format(name))
 res = dia.startProcess(args)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.normalExit()
 if res and not rx_prot.exactMatch(target):
 if target.startswith(project.getProjectPath()):
 if isDir:
 project.moveDirectory(name, target)
 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:
 dia = SvnDialog(self.tr('Tagging {0} in the Subversion repository')
 .format(name))
 res = dia.startProcess(args)
 if res:
-dia.exec_()
+dia.exec()
 def vcsRevert(self, name):
 """
 Public method used to revert changes made to a file/directory.
 self.parent(),
 self.tr("Revert changes"),
 self.tr("Do you really want to revert all changes to"
 " these files or directories?"),
 names)
-yes = dlg.exec_() == QDialog.Accepted
+yes = dlg.exec() == QDialog.Accepted
 else:
 yes = E5MessageBox.yesNo(
 None,
 self.tr("Revert changes"),
 self.tr("""Do you really want to revert all changes of"""
 """ the project?"""))
 if yes:
 dia = SvnDialog(self.tr('Reverting changes'))
 res = dia.startProcess(args)
 if res:
-dia.exec_()
+dia.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:
 dia = SvnDialog(self.tr('Switching to {0}')
 .format(tn))
 res = dia.startProcess(args, setLanguage=True)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
 def vcsMerge(self, name):
 del opts[opts.index('--force')]
 from .SvnMergeDialog import SvnMergeDialog
 dlg = SvnMergeDialog(
 self.mergeList[0], self.mergeList[1], self.mergeList[2], force)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 urlrev1, urlrev2, target, force = dlg.getParameters()
 else:
 return
 # remember URL or revision
 args.append(fname)
 dia = SvnDialog(self.tr('Merging {0}').format(name))
 res = dia.startProcess(args, dname)
 if res:
-dia.exec_()
+dia.exec()
 def vcsRegisteredState(self, name):
 """
 Public method used to get the registered state of a file in the vcs.
 dia = SvnDialog(self.tr('Cleaning up {0}')
 .format(name))
 res = dia.startProcess(args)
 if res:
-dia.exec_()
+dia.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.
 self.addArguments(args, commandList)
 dia = SvnDialog(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.
 args.append(name)
 dia = SvnDialog(self.tr('Resolving conficts'))
 res = dia.startProcess(args)
 if res:
-dia.exec_()
+dia.exec()
 self.checkVCSStatus()
 def svnCopy(self, name, project):
 """
 Public method used to copy a file/directory.
 """
 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()
 args = []
 args.append('copy')
 self.addArguments(args, self.options['global'])
 dia = SvnDialog(self.tr('Copying {0}')
 .format(name))
 res = dia.startProcess(args)
 if res:
-dia.exec_()
+dia.exec()
 res = dia.normalExit()
 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 list is requested
 """
 from .SvnPropSetDialog import SvnPropSetDialog
 dlg = SvnPropSetDialog()
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 propName, fileFlag, propValue = dlg.getData()
 if not propName:
 E5MessageBox.critical(
 self.__ui,
 self.tr("Subversion Set Property"),
 args.append(fname)
 dia = SvnDialog(self.tr('Subversion Set Property'))
 res = dia.startProcess(args, dname)
 if res:
-dia.exec_()
+dia.exec()
 def svnDelProp(self, name, recursive=False):
 """
 Public method used to delete a property of a file/directory.
 args.append(fname)
 dia = SvnDialog(self.tr('Subversion Delete Property'))
 res = dia.startProcess(args, dname)
 if res:
-dia.exec_()
+dia.exec()
 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()
 from .SvnDiffDialog import SvnDiffDialog
 self.diff = SvnDiffDialog(self)
 self.diff.show()
 self.diff.start(name, revisions)
 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()
 from .SvnDiffDialog import SvnDiffDialog
 self.diff = SvnDiffDialog(self)
 self.diff.show()
 QApplication.processEvents()
 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 = ""
 dia = SvnDialog(
 self.tr('Locking in the Subversion repository'), parent)
 res = dia.startProcess(args, dname)
 if res:
-dia.exec_()
+dia.exec()
 def svnUnlock(self, name, breakIt=False, parent=None):
 """
 Public method used to unlock a file in the Subversion repository.
 dia = SvnDialog(
 self.tr('Unlocking in the Subversion repository'), parent)
 res = dia.startProcess(args, dname)
 if res:
-dia.exec_()
+dia.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()
 args = []
 args.append('switch')
 if not inside:
 args.append('--relocate')
 args.append(projectPath)
 dia = SvnDialog(self.tr('Relocating'))
 res = dia.startProcess(args)
 if res:
-dia.exec_()
+dia.exec()
 def svnRepoBrowser(self, projectPath=None):
 """
 Public method to open the repository browser.
 args.append(fname)
 dia = SvnDialog(self.tr('Remove from changelist'))
 res = dia.startProcess(args, dname)
 if res:
-dia.exec_()
+dia.exec()
 def svnAddToChangelist(self, names):
 """
 Public method to add a file or directory to a changelist.
 args.append(fname)
 dia = SvnDialog(self.tr('Remove from changelist'))
 res = dia.startProcess(args, dname)
 if res:
-dia.exec_()
+dia.exec()
 def svnShowChangelists(self, path):
 """
 Public method used to inspect the change lists defined for the project.
 args.append(".")
 dia = SvnDialog(self.tr('Upgrade'))
 res = dia.startProcess(args, path)
 if res:
-dia.exec_()
+dia.exec()
 ###########################################################################
 ## Private Subversion specific methods are below.
 ###########################################################################

Mercurial Repositories > eric / file comparison

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

eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py