Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Sep 27 14:17:38 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py	Tue Sep 29 18:58:05 2020 +0200
@@ -11,7 +11,7 @@
 import shutil
 
 from PyQt5.QtCore import (
-    QProcess, pyqtSignal, QFileInfo, QFileSystemWatcher, QCoreApplication
+    pyqtSignal, QFileInfo, QFileSystemWatcher, QCoreApplication
 )
 from PyQt5.QtWidgets import QApplication, QDialog, QInputDialog
 
@@ -3456,19 +3456,7 @@
         args = self.initCommand("bookmarks")
         
         client = self.getClient()
-        output = ""
-        if client:
-            output = client.runcommand(args)[0]
-        else:
-            process = QProcess()
-            process.setWorkingDirectory(repodir)
-            process.start('hg', args)
-            procStarted = process.waitForStarted(5000)
-            if procStarted:
-                finished = process.waitForFinished(30000)
-                if finished and process.exitCode() == 0:
-                    output = str(process.readAllStandardOutput(),
-                                 self.getEncoding(), 'replace')
+        output = client.runcommand(args)[0]
         
         self.bookmarksList = []
         for line in output.splitlines():
@@ -3673,19 +3661,7 @@
         args.append('--bookmarks')
         
         client = self.getClient()
-        output = ""
-        if client:
-            output = client.runcommand(args)[0]
-        else:
-            process = QProcess()
-            process.setWorkingDirectory(repodir)
-            process.start('hg', args)
-            procStarted = process.waitForStarted(5000)
-            if procStarted:
-                finished = process.waitForFinished(30000)
-                if finished and process.exitCode() == 0:
-                    output = str(process.readAllStandardOutput(),
-                                 self.getEncoding(), 'replace')
+        output = client.runcommand(args)[0]
         
         for line in output.splitlines():
             if line.startswith(" "):