Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py	Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py	Tue Oct 06 17:52:44 2020 +0200
@@ -55,7 +55,7 @@
         
         from .LfConvertDataDialog import LfConvertDataDialog
         dlg = LfConvertDataDialog(projectDir, direction)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             newName, minSize, patterns = dlg.getData()
             newProjectFile = os.path.join(
                 newName, os.path.basename(projectFile))
@@ -75,7 +75,7 @@
             dia = HgDialog(self.tr('Convert Project - Converting'), self.vcs)
             res = dia.startProcess(args, repodir)
             if res:
-                dia.exec_()
+                dia.exec()
                 res = dia.normalExit() and os.path.isdir(
                     os.path.join(newName, self.vcs.adminDir))
             
@@ -87,7 +87,7 @@
                                self.vcs, useClient=False)
                 res = dia.startProcess(args, newName)
                 if res:
-                    dia.exec_()
+                    dia.exec()
                     res = dia.normalExit() and os.path.isfile(newProjectFile)
             
             # step 3: close current project and open new one
@@ -137,7 +137,7 @@
             self.vcs)
         res = dia.startProcess(args, repodir)
         if res:
-            dia.exec_()
+            dia.exec()
     
     def hgLfPull(self, projectDir, revisions=None):
         """
@@ -159,7 +159,7 @@
         else:
             from .LfRevisionsInputDialog import LfRevisionsInputDialog
             dlg = LfRevisionsInputDialog()
-            if dlg.exec_() == QDialog.Accepted:
+            if dlg.exec() == QDialog.Accepted:
                 revs = dlg.getRevisions()
         
         if revs:
@@ -172,7 +172,7 @@
             dia = HgDialog(self.tr("Pulling large files"), self.vcs)
             res = dia.startProcess(args, repodir)
             if res:
-                dia.exec_()
+                dia.exec()
     
     def hgLfVerify(self, projectDir, mode):
         """
@@ -203,4 +203,4 @@
             self.vcs)
         res = dia.startProcess(args, repodir)
         if res:
-            dia.exec_()
+            dia.exec()