eric6/Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py

changeset 7759
51aa6c6b66f7
parent 7360
9190402e4505
child 7780
41420f82c0ac
diff -r dd54d33d21d2 -r 51aa6c6b66f7 eric6/Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py	Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py	Tue Oct 06 17:52:44 2020 +0200
@@ -53,7 +53,7 @@
                             self.vcs.hgGetBranchesList(repodir),
                             self.vcs.hgGetBookmarksList(repodir),
                             rev)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             rev, bookmark, force, noBackup, keep = dlg.getData()
             
             args = self.vcs.initCommand("strip")
@@ -74,7 +74,7 @@
                 self.vcs)
             res = dia.startProcess(args, repodir)
             if res:
-                dia.exec_()
+                dia.exec()
                 res = dia.hasAddOrDelete()
                 self.vcs.checkVCSStatus()
         return res

eric ide

mercurial