diff -r dd54d33d21d2 -r 51aa6c6b66f7 eric6/Plugins/VcsPlugins/vcsMercurial/hg.py
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Oct 06 17:52:44 2020 +0200
@@ -312,7 +312,7 @@
dia = HgDialog(self.tr('Creating Mercurial repository'), self)
res = dia.startProcess(args)
if res:
- dia.exec_()
+ dia.exec()
status = dia.normalExit()
if status:
@@ -330,7 +330,7 @@
self)
res = dia.startProcess(args, projectDir)
if res:
- dia.exec_()
+ dia.exec()
status = dia.normalExit()
return status, False
@@ -370,7 +370,7 @@
self)
res = dia.startProcess(args)
if res:
- dia.exec_()
+ dia.exec()
return dia.normalExit()
def vcsExport(self, vcsDataDict, projectDir):
@@ -543,7 +543,7 @@
self)
res = dia.startProcess(args, dname)
if res:
- dia.exec_()
+ dia.exec()
self.committed.emit()
if self.__forgotNames:
model = e5App().getObject("Project").getModel()
@@ -614,7 +614,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -662,7 +662,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def vcsAddBinary(self, name, isDir=False):
"""
@@ -728,7 +728,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.normalExitWithoutErrors()
return res
@@ -754,7 +754,7 @@
else:
from .HgCopyDialog import HgCopyDialog
dlg = HgCopyDialog(name, None, True)
- accepted = dlg.exec_() == QDialog.Accepted
+ accepted = dlg.exec() == QDialog.Accepted
if accepted:
target, force = dlg.getData()
@@ -781,7 +781,7 @@
dia = HgDialog(self.tr('Renaming {0}').format(name), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.normalExit()
if res:
if target.startswith(project.getProjectPath()):
@@ -883,7 +883,7 @@
from .HgTagDialog import HgTagDialog
dlg = HgTagDialog(self.hgGetTagsList(repodir, withType=True),
revision, tagName)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
tag, revision, tagOp, force = dlg.getParameters()
else:
return False
@@ -915,7 +915,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
return True
@@ -960,7 +960,7 @@
"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,
@@ -971,7 +971,7 @@
dia = HgDialog(self.tr('Reverting changes'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
else:
@@ -1002,7 +1002,7 @@
dlg = HgMergeDialog(self.hgGetTagsList(repodir),
self.hgGetBranchesList(repodir),
self.hgGetBookmarksList(repodir))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
rev, force = dlg.getParameters()
else:
return
@@ -1022,7 +1022,7 @@
dia = HgDialog(self.tr('Merging').format(name), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
self.checkVCSStatus()
def hgReMerge(self, name):
@@ -1064,7 +1064,7 @@
"Do you really want to re-merge these files"
" or directories?"),
names)
- yes = dlg.exec_() == QDialog.Accepted
+ yes = dlg.exec() == QDialog.Accepted
else:
yes = E5MessageBox.yesNo(
None,
@@ -1074,7 +1074,7 @@
dia = HgDialog(self.tr('Re-Merging').format(name), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
self.checkVCSStatus()
def vcsSwitch(self, name):
@@ -1100,7 +1100,7 @@
self.hgGetBranchesList(repodir),
self.hgGetBookmarksList(repodir),
self.tr("Current branch tip"))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
rev = dlg.getRevision()
return self.vcsUpdate(name, revision=rev)
@@ -1276,7 +1276,7 @@
"""
from .HgCommandDialog import HgCommandDialog
dlg = HgCommandDialog(self.commandHistory, name)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
command = dlg.getData()
commandList = Utilities.parseOptionString(command)
@@ -1299,7 +1299,7 @@
dia = HgDialog(self.tr('Mercurial command'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def vcsOptionsDialog(self, project, archive, editable=False, parent=None):
"""
@@ -1441,7 +1441,7 @@
from .HgCopyDialog import HgCopyDialog
dlg = HgCopyDialog(name)
res = False
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
target, force = dlg.getData()
args = self.initCommand("copy")
@@ -1461,7 +1461,7 @@
self.tr('Copying {0}').format(name), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.normalExit()
if (
res and
@@ -1625,7 +1625,7 @@
dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(repodir),
self.hgGetBranchesList(repodir),
self.hgGetBookmarksList(repodir))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
revisions = dlg.getRevisions()
if self.diff is None:
from .HgDiffDialog import HgDiffDialog
@@ -1679,7 +1679,7 @@
dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(repodir),
self.hgGetBranchesList(repodir),
self.hgGetBookmarksList(repodir))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
rev1, rev2 = dlg.getRevisions()
else:
return
@@ -1819,7 +1819,7 @@
dia = HgDialog(title, self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
if (
self.bundleFile and
@@ -1860,7 +1860,7 @@
self.tr('Pushing to a remote Mercurial repository'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
self.checkVCSStatus()
def hgInfo(self, ppath, mode="heads"):
@@ -1938,7 +1938,7 @@
.format(author, cdate, ctime))
dlg = VcsRepositoryInfoDialog(None, "\n".join(info))
- dlg.exec_()
+ dlg.exec()
def hgConflicts(self, name):
"""
@@ -1988,7 +1988,7 @@
dia = HgDialog(title, self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
self.checkVCSStatus()
def hgAbortMerge(self, name):
@@ -2020,7 +2020,7 @@
self)
res = dia.startProcess(args, repodir, False)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -2042,7 +2042,7 @@
from .HgBranchInputDialog import HgBranchInputDialog
dlg = HgBranchInputDialog(self.hgGetBranchesList(repodir))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
name, commit = dlg.getData()
name = name.strip().replace(" ", "_")
args = self.initCommand("branch")
@@ -2053,7 +2053,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
if commit:
self.vcsCommit(
repodir,
@@ -2080,7 +2080,7 @@
dia = HgDialog(self.tr('Showing current branch'), self)
res = dia.startProcess(args, repodir, False)
if res:
- dia.exec_()
+ dia.exec()
def hgGetCurrentBranch(self, repodir):
"""
@@ -2103,7 +2103,7 @@
"""
from .HgUserConfigDialog import HgUserConfigDialog
dlg = HgUserConfigDialog(version=self.version)
- dlg.exec_()
+ dlg.exec()
def hgEditConfig(self, name, withLargefiles=True, largefilesData=None):
"""
@@ -2132,7 +2132,7 @@
from .HgRepoConfigDataDialog import HgRepoConfigDataDialog
dlg = HgRepoConfigDataDialog(withLargefiles=withLargefiles,
largefilesData=largefilesData)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
createContents = True
defaultUrl, defaultPushUrl = dlg.getData()
if withLargefiles:
@@ -2190,7 +2190,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def hgShowConfig(self, name):
"""
@@ -2215,7 +2215,7 @@
self)
res = dia.startProcess(args, repodir, False)
if res:
- dia.exec_()
+ dia.exec()
def hgShowPaths(self, name):
"""
@@ -2239,7 +2239,7 @@
self)
res = dia.startProcess(args, repodir, False)
if res:
- dia.exec_()
+ dia.exec()
def hgRecover(self, name):
"""
@@ -2263,7 +2263,7 @@
self)
res = dia.startProcess(args, repodir, False)
if res:
- dia.exec_()
+ dia.exec()
def hgIdentify(self, name):
"""
@@ -2285,7 +2285,7 @@
dia = HgDialog(self.tr('Identifying project directory'), self)
res = dia.startProcess(args, repodir, False)
if res:
- dia.exec_()
+ dia.exec()
def hgCreateIgnoreFile(self, name, autoAdd=False):
"""
@@ -2364,7 +2364,7 @@
self.hgGetBranchesList(repodir),
self.hgGetBookmarksList(repodir),
version=self.version)
- if dlg.exec_() != QDialog.Accepted:
+ if dlg.exec() != QDialog.Accepted:
return
revs, baseRevs, compression, bundleAll = dlg.getParameters()
@@ -2423,7 +2423,7 @@
dia = HgDialog(self.tr('Create changegroup'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def hgPreviewBundle(self, name):
"""
@@ -2504,7 +2504,7 @@
dia = HgDialog(self.tr('Apply changegroups'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
@@ -2539,7 +2539,7 @@
dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir),
self.hgGetBranchesList(repodir),
self.hgGetBookmarksList(repodir))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
rev = dlg.getRevision()
else:
return
@@ -2553,7 +2553,7 @@
self.tr('Mercurial Bisect ({0})').format(subcommand), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def hgForget(self, name):
"""
@@ -2586,7 +2586,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
if isinstance(name, list):
self.__forgotNames.extend(name)
else:
@@ -2612,7 +2612,7 @@
dlg = HgBackoutDialog(self.hgGetTagsList(repodir),
self.hgGetBranchesList(repodir),
self.hgGetBookmarksList(repodir))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
rev, merge, date, user, message = dlg.getParameters()
if not rev:
E5MessageBox.warning(
@@ -2638,7 +2638,7 @@
dia = HgDialog(self.tr('Backing out changeset'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def hgRollback(self, name):
"""
@@ -2665,7 +2665,7 @@
dia = HgDialog(self.tr('Rollback last transaction'), self)
res = dia.startProcess(["rollback"], repodir)
if res:
- dia.exec_()
+ dia.exec()
def hgServe(self, name):
"""
@@ -2705,7 +2705,7 @@
from .HgImportDialog import HgImportDialog
dlg = HgImportDialog(self)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
(patchFile, noCommit, message, date, user, withSecret, stripCount,
force) = dlg.getParameters()
@@ -2735,7 +2735,7 @@
dia = HgDialog(self.tr("Import Patch"), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
else:
@@ -2761,7 +2761,7 @@
from .HgExportDialog import HgExportDialog
dlg = HgExportDialog(self.hgGetBookmarksList(repodir),
self.version >= (4, 7, 0))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
(filePattern, revisions, bookmark, switchParent, allText,
noDates, git) = dlg.getParameters()
@@ -2787,7 +2787,7 @@
dia = HgDialog(self.tr("Export Patches"), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def hgPhase(self, name, data=None):
"""
@@ -2811,7 +2811,7 @@
if data is None:
from .HgPhaseDialog import HgPhaseDialog
dlg = HgPhaseDialog()
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
data = dlg.getData()
if data:
@@ -2834,7 +2834,7 @@
dia = HgDialog(self.tr("Change Phase"), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.normalExitWithoutErrors()
else:
res = False
@@ -2860,7 +2860,7 @@
from .HgGraftDialog import HgGraftDialog
res = False
dlg = HgGraftDialog(self, revs)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
(revs,
(userData, currentUser, userName),
(dateData, currentDate, dateStr),
@@ -2891,7 +2891,7 @@
dia = HgDialog(self.tr('Copy Changesets'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -2923,7 +2923,7 @@
dia = HgDialog(title, self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -2978,7 +2978,7 @@
from .HgArchiveDialog import HgArchiveDialog
dlg = HgArchiveDialog(self)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
archive, type_, prefix, subrepos = dlg.getData()
args = self.initCommand("archive")
@@ -2995,7 +2995,7 @@
dia = HgDialog(self.tr("Create Unversioned Archive"), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def hgDeleteBackups(self):
"""
@@ -3049,7 +3049,7 @@
ppath = self.__projectHelper.getProject().getProjectPath()
hgsub = self.getHgSubPath()
dlg = HgAddSubrepositoryDialog(ppath)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
relPath, subrepoType, subrepoUrl = dlg.getData()
if subrepoType == "hg":
url = subrepoUrl
@@ -3140,7 +3140,7 @@
HgRemoveSubrepositoriesDialog
)
dlg = HgRemoveSubrepositoriesDialog(subrepositories)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
subrepositories, removedSubrepos, deleteSubrepos = dlg.getData()
contents = "\n".join(subrepositories) + "\n"
try:
@@ -3494,7 +3494,7 @@
self.hgGetTagsList(repodir),
self.hgGetBranchesList(repodir),
self.hgGetBookmarksList(repodir))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
revision, bookmark = dlg.getData()
ok = True
else:
@@ -3510,7 +3510,7 @@
dia = HgDialog(self.tr('Mercurial Bookmark'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def hgBookmarkDelete(self, name, bookmark=None):
"""
@@ -3543,7 +3543,7 @@
dia = HgDialog(self.tr('Delete Mercurial Bookmark'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def hgBookmarkRename(self, name, renameInfo=None):
"""
@@ -3564,7 +3564,7 @@
if not renameInfo:
from .HgBookmarkRenameDialog import HgBookmarkRenameDialog
dlg = HgBookmarkRenameDialog(self.hgGetBookmarksList(repodir))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
renameInfo = dlg.getData()
if renameInfo:
@@ -3576,7 +3576,7 @@
dia = HgDialog(self.tr('Rename Mercurial Bookmark'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def hgBookmarkMove(self, name, revision=None, bookmark=None):
"""
@@ -3601,7 +3601,7 @@
self.hgGetTagsList(repodir),
self.hgGetBranchesList(repodir),
self.hgGetBookmarksList(repodir))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
revision, bookmark = dlg.getData()
ok = True
else:
@@ -3618,7 +3618,7 @@
dia = HgDialog(self.tr('Move Mercurial Bookmark'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def hgBookmarkIncoming(self, name):
"""
@@ -3714,7 +3714,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def hgBookmarkPush(self, name, current=False, bookmark=None):
"""
@@ -3758,4 +3758,4 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
