--- a/eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py Tue Oct 06 17:52:44 2020 +0200
@@ -328,7 +328,7 @@
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)
@@ -402,7 +402,7 @@
locker.unlock()
if not noDialog:
dlg.finish()
- dlg.exec_()
+ dlg.exec()
return status
def vcsExport(self, vcsDataDict, projectDir):
@@ -466,7 +466,7 @@
dlg.showError(e.args[0])
locker.unlock()
dlg.finish()
- dlg.exec_()
+ dlg.exec()
return status
def vcsCommit(self, name, message, noDialog=False):
@@ -604,7 +604,7 @@
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()
@@ -647,7 +647,7 @@
locker.unlock()
if not noDialog:
dlg.finish()
- dlg.exec_()
+ dlg.exec()
res = dlg.hasAddOrDelete()
else:
res = False
@@ -762,7 +762,7 @@
locker.unlock()
if not noDialog:
dlg.finish()
- dlg.exec_()
+ dlg.exec()
os.chdir(cwd)
def vcsAddBinary(self, name, isDir=False):
@@ -868,7 +868,7 @@
dlg.showError(e.args[0])
locker.unlock()
dlg.finish()
- dlg.exec_()
+ dlg.exec()
os.chdir(cwd)
def vcsRemove(self, name, project=False, noDialog=False):
@@ -910,7 +910,7 @@
locker.unlock()
if not noDialog:
dlg.finish()
- dlg.exec_()
+ dlg.exec()
return res
@@ -936,7 +936,7 @@
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:
@@ -975,7 +975,7 @@
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:
@@ -1065,7 +1065,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)
@@ -1127,7 +1127,7 @@
rev and dlg.showMessage(
self.tr("Revision {0}.\n").format(rev.number))
dlg.finish()
- dlg.exec_()
+ dlg.exec()
def vcsRevert(self, name):
"""
@@ -1154,7 +1154,7 @@
"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,
@@ -1177,7 +1177,7 @@
dlg.showError(e.args[0])
locker.unlock()
dlg.finish()
- dlg.exec_()
+ dlg.exec()
self.checkVCSStatus()
def vcsSwitch(self, name):
@@ -1208,7 +1208,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)
@@ -1254,7 +1254,7 @@
dlg.showError(e.args[0])
locker.unlock()
dlg.finish()
- dlg.exec_()
+ dlg.exec()
res = dlg.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -1271,7 +1271,7 @@
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
@@ -1361,7 +1361,7 @@
dlg.showError(e.args[0])
locker.unlock()
dlg.finish()
- dlg.exec_()
+ dlg.exec()
os.chdir(cwd)
def vcsRegisteredState(self, name):
@@ -1659,7 +1659,7 @@
dlg.showError(e.args[0])
locker.unlock()
dlg.finish()
- dlg.exec_()
+ dlg.exec()
def vcsCommandLine(self, name):
"""
@@ -1669,7 +1669,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)
@@ -1691,7 +1691,7 @@
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):
"""
@@ -1819,7 +1819,7 @@
dlg.showError(e.args[0])
locker.unlock()
dlg.finish()
- dlg.exec_()
+ dlg.exec()
os.chdir(cwd)
self.checkVCSStatus()
@@ -1835,7 +1835,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()
client = self.getClient()
@@ -1861,7 +1861,7 @@
dlg.showError(e.args[0])
locker.unlock()
dlg.finish()
- dlg.exec_()
+ dlg.exec()
if (
res and
not rx_prot.exactMatch(target) and
@@ -1897,7 +1897,7 @@
"""
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(
@@ -1937,7 +1937,7 @@
locker.unlock()
dlg.showMessage(self.tr("Property set."))
dlg.finish()
- dlg.exec_()
+ dlg.exec()
os.chdir(cwd)
def svnDelProp(self, name, recursive=False):
@@ -1949,7 +1949,7 @@
"""
from .SvnPropDelDialog import SvnPropDelDialog
dlg = SvnPropDelDialog(recursive)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
propName, recurse = dlg.getData()
if not propName:
@@ -1989,7 +1989,7 @@
locker.unlock()
dlg.showMessage(self.tr("Property deleted."))
dlg.finish()
- dlg.exec_()
+ dlg.exec()
os.chdir(cwd)
def svnListTagBranch(self, path, tags=True):
@@ -2068,7 +2068,7 @@
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
@@ -2111,7 +2111,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()
if self.diff is None:
from .SvnDiffDialog import SvnDiffDialog
@@ -2180,7 +2180,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 = ""
@@ -2294,7 +2294,7 @@
dlg.showError(str(e))
locker.unlock()
dlg.finish()
- dlg.exec_()
+ dlg.exec()
os.chdir(cwd)
def svnUnlock(self, name, breakIt=False, parent=None):
@@ -2331,7 +2331,7 @@
dlg.showError(str(e))
locker.unlock()
dlg.finish()
- dlg.exec_()
+ dlg.exec()
os.chdir(cwd)
def svnInfo(self, projectPath, name):
@@ -2344,7 +2344,7 @@
from .SvnInfoDialog import SvnInfoDialog
dlg = SvnInfoDialog(self)
dlg.start(projectPath, name)
- dlg.exec_()
+ dlg.exec()
def svnRelocate(self, projectPath):
"""
@@ -2355,7 +2355,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()
if inside:
msg = "switch {0} {1}".format(newUrl, projectPath)
@@ -2375,7 +2375,7 @@
dlg.showError(e.args[0])
locker.unlock()
dlg.finish()
- dlg.exec_()
+ dlg.exec()
def svnRepoBrowser(self, projectPath=None):
"""
@@ -2429,7 +2429,7 @@
dlg.showError(e.args[0])
locker.unlock()
dlg.finish()
- dlg.exec_()
+ dlg.exec()
def svnAddToChangelist(self, names):
"""
@@ -2467,7 +2467,7 @@
dlg.showError(e.args[0])
locker.unlock()
dlg.finish()
- dlg.exec_()
+ dlg.exec()
def svnShowChangelists(self, path):
"""
@@ -2524,7 +2524,7 @@
dlg.showError(e.args[0])
locker.unlock()
dlg.finish()
- dlg.exec_()
+ dlg.exec()
###########################################################################
## Private Subversion specific methods are below.
