diff -r dd54d33d21d2 -r 51aa6c6b66f7 eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Tue Oct 06 17:52:44 2020 +0200
@@ -184,7 +184,7 @@
from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog
dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.NEW_MODE)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
(name, message,
(userData, currentUser, userName),
(dateData, currentDate, dateStr)) = dlg.getData()
@@ -210,7 +210,7 @@
dia = HgDialog(self.tr('New Patch'), self.vcs)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
self.vcs.checkVCSStatus()
def hgQueueRefreshPatch(self, name, editMessage=False):
@@ -235,7 +235,7 @@
from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog
dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.REFRESH_MODE,
currentMessage)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
(name, message,
(userData, currentUser, userName),
(dateData, currentDate, dateStr)) = dlg.getData()
@@ -260,7 +260,7 @@
dia = HgDialog(self.tr('Update Current Patch'), self.vcs)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
self.vcs.checkVCSStatus()
def hgQueueShowPatch(self, name):
@@ -352,7 +352,7 @@
dia = HgDialog(title, self.vcs)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.vcs.checkVCSStatus()
return res
@@ -387,7 +387,7 @@
dia = HgDialog(self.tr('Finish Applied Patches'), self.vcs)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
self.vcs.checkVCSStatus()
def hgQueueRenamePatch(self, name):
@@ -412,7 +412,7 @@
HgQueuesRenamePatchDialog
)
dlg = HgQueuesRenamePatchDialog(currentPatch, patchnames)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
newName, selectedPatch = dlg.getData()
if selectedPatch:
args.append(selectedPatch)
@@ -421,7 +421,7 @@
dia = HgDialog(self.tr("Rename Patch"), self.vcs)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def hgQueueDeletePatch(self, name):
"""
@@ -452,7 +452,7 @@
dia = HgDialog(self.tr("Delete Patch"), self.vcs)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
else:
E5MessageBox.information(
None,
@@ -479,7 +479,7 @@
if patchnames:
from .HgQueuesFoldDialog import HgQueuesFoldDialog
dlg = HgQueuesFoldDialog(patchnames)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
message, patchesList = dlg.getData()
if message:
args.append("--message")
@@ -490,7 +490,7 @@
dia = HgDialog(self.tr("Fold Patches"), self.vcs)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
else:
E5MessageBox.information(
None,
@@ -625,7 +625,7 @@
)
dlg = HgQueuesGuardsSelectionDialog(
guardsList, activeGuards=activeGuardsList, listOnly=False)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
guards = dlg.getData()
if guards:
args = self.vcs.initCommand("qselect")
@@ -634,7 +634,7 @@
dia = HgDialog(self.tr('Set Active Guards'), self.vcs)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
else:
E5MessageBox.information(
None,
@@ -661,7 +661,7 @@
dia = HgDialog(self.tr('Deactivate Guards'), self.vcs)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def hgQueueGuardsIdentifyActive(self, name):
"""
@@ -682,7 +682,7 @@
HgQueuesGuardsSelectionDialog
)
dlg = HgQueuesGuardsSelectionDialog(guardsList, listOnly=True)
- dlg.exec_()
+ dlg.exec()
def hgQueueCreateRenameQueue(self, name, isCreate):
"""
@@ -708,7 +708,7 @@
dlg = HgQueuesQueueManagementDialog(
HgQueuesQueueManagementDialog.NAME_INPUT,
title, False, repodir, self.vcs)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
queueName = dlg.getData()
if queueName:
args = self.vcs.initCommand("qqueue")
@@ -771,7 +771,7 @@
dlg = HgQueuesQueueManagementDialog(
HgQueuesQueueManagementDialog.QUEUE_INPUT,
title, True, repodir, self.vcs)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
queueName = dlg.getData()
if queueName:
args = self.vcs.initCommand("qqueue")
@@ -846,7 +846,7 @@
self.tr('Initializing new queue repository'), self.vcs)
res = dia.startProcess(args)
if res:
- dia.exec_()
+ dia.exec()
def hgQueueStatus(self, name):
"""
