--- a/eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py Tue Oct 06 17:52:44 2020 +0200
@@ -324,7 +324,7 @@
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)
@@ -389,7 +389,7 @@
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):
@@ -444,7 +444,7 @@
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):
@@ -568,7 +568,7 @@
self.tr('Commiting changes to Subversion repository'))
res = dia.startProcess(args, dname)
if res:
- dia.exec_()
+ dia.exec()
self.committed.emit()
self.checkVCSStatus()
@@ -605,7 +605,7 @@
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
@@ -705,7 +705,7 @@
' repository'))
res = dia.startProcess(args, wdir)
if res:
- dia.exec_()
+ dia.exec()
def vcsAddBinary(self, name, isDir=False):
"""
@@ -796,7 +796,7 @@
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):
"""
@@ -832,7 +832,7 @@
' repository'))
res = dia.startProcess(args)
if res:
- dia.exec_()
+ dia.exec()
res = dia.normalExit()
return res
@@ -862,7 +862,7 @@
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:
@@ -893,7 +893,7 @@
.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()):
@@ -983,7 +983,7 @@
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)
@@ -1032,7 +1032,7 @@
.format(name))
res = dia.startProcess(args)
if res:
- dia.exec_()
+ dia.exec()
def vcsRevert(self, name):
"""
@@ -1064,7 +1064,7 @@
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,
@@ -1075,7 +1075,7 @@
dia = SvnDialog(self.tr('Reverting changes'))
res = dia.startProcess(args)
if res:
- dia.exec_()
+ dia.exec()
self.checkVCSStatus()
def vcsSwitch(self, name):
@@ -1105,7 +1105,7 @@
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)
@@ -1150,7 +1150,7 @@
.format(tn))
res = dia.startProcess(args, setLanguage=True)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -1171,7 +1171,7 @@
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
@@ -1214,7 +1214,7 @@
dia = SvnDialog(self.tr('Merging {0}').format(name))
res = dia.startProcess(args, dname)
if res:
- dia.exec_()
+ dia.exec()
def vcsRegisteredState(self, name):
"""
@@ -1481,7 +1481,7 @@
.format(name))
res = dia.startProcess(args)
if res:
- dia.exec_()
+ dia.exec()
def vcsCommandLine(self, name):
"""
@@ -1491,7 +1491,7 @@
"""
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)
@@ -1510,7 +1510,7 @@
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):
"""
@@ -1685,7 +1685,7 @@
dia = SvnDialog(self.tr('Resolving conficts'))
res = dia.startProcess(args)
if res:
- dia.exec_()
+ dia.exec()
self.checkVCSStatus()
def svnCopy(self, name, project):
@@ -1700,7 +1700,7 @@
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 = []
@@ -1717,7 +1717,7 @@
.format(name))
res = dia.startProcess(args)
if res:
- dia.exec_()
+ dia.exec()
res = dia.normalExit()
if (
res and
@@ -1753,7 +1753,7 @@
"""
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(
@@ -1782,7 +1782,7 @@
dia = SvnDialog(self.tr('Subversion Set Property'))
res = dia.startProcess(args, dname)
if res:
- dia.exec_()
+ dia.exec()
def svnDelProp(self, name, recursive=False):
"""
@@ -1824,7 +1824,7 @@
dia = SvnDialog(self.tr('Subversion Delete Property'))
res = dia.startProcess(args, dname)
if res:
- dia.exec_()
+ dia.exec()
def svnListTagBranch(self, path, tags=True):
"""
@@ -1900,7 +1900,7 @@
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)
@@ -1940,7 +1940,7 @@
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)
@@ -2007,7 +2007,7 @@
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 = ""
@@ -2101,7 +2101,7 @@
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):
"""
@@ -2129,7 +2129,7 @@
self.tr('Unlocking in the Subversion repository'), parent)
res = dia.startProcess(args, dname)
if res:
- dia.exec_()
+ dia.exec()
def svnRelocate(self, projectPath):
"""
@@ -2140,7 +2140,7 @@
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')
@@ -2153,7 +2153,7 @@
dia = SvnDialog(self.tr('Relocating'))
res = dia.startProcess(args)
if res:
- dia.exec_()
+ dia.exec()
def svnRepoBrowser(self, projectPath=None):
"""
@@ -2206,7 +2206,7 @@
dia = SvnDialog(self.tr('Remove from changelist'))
res = dia.startProcess(args, dname)
if res:
- dia.exec_()
+ dia.exec()
def svnAddToChangelist(self, names):
"""
@@ -2241,7 +2241,7 @@
dia = SvnDialog(self.tr('Remove from changelist'))
res = dia.startProcess(args, dname)
if res:
- dia.exec_()
+ dia.exec()
def svnShowChangelists(self, path):
"""
@@ -2304,7 +2304,7 @@
dia = SvnDialog(self.tr('Upgrade'))
res = dia.startProcess(args, path)
if res:
- dia.exec_()
+ dia.exec()
###########################################################################
## Private Subversion specific methods are below.
