diff -r dd54d33d21d2 -r 51aa6c6b66f7 eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py Tue Oct 06 17:52:44 2020 +0200
@@ -54,7 +54,7 @@
self.vcs.hgGetBranchesList(repodir),
self.vcs.hgGetBookmarksList(repodir),
rev)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
rev, force, keep = dlg.getData()
args = self.vcs.initCommand("histedit")
@@ -79,7 +79,7 @@
useClient=False)
res = dia.startProcess(args, repodir, environment=env)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.vcs.checkVCSStatus()
return res
@@ -114,7 +114,7 @@
useClient=False)
res = dia.startProcess(args, repodir, environment=env)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.vcs.checkVCSStatus()
return res
@@ -149,7 +149,7 @@
useClient=False)
res = dia.startProcess(args, repodir, environment=env)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.vcs.checkVCSStatus()
return res
@@ -185,7 +185,7 @@
useClient=False)
res = dia.startProcess(args, repodir, environment=env)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.vcs.checkVCSStatus()
return res
