Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Sat Sep 21 20:30:56 2019 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Sat Sep 21 22:03:03 2019 +0200
@@ -12,8 +12,10 @@
 import os
 
 from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer
-from PyQt5.QtWidgets import QAbstractButton, QDialogButtonBox, QHeaderView, \
-    QTreeWidgetItem, QLineEdit, QApplication, QWidget
+from PyQt5.QtWidgets import (
+    QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit,
+    QApplication, QWidget
+)
 
 from E5Gui import E5MessageBox
 from E5Gui.E5Application import e5App
@@ -79,8 +81,10 @@
             if self.__hgClient.isExecuting():
                 self.__hgClient.cancel()
         else:
-            if self.process is not None and \
-               self.process.state() != QProcess.NotRunning:
+            if (
+                self.process is not None and
+                self.process.state() != QProcess.NotRunning
+            ):
                 self.process.terminate()
                 QTimer.singleShot(2000, self.process.kill)
                 self.process.waitForFinished(3000)
@@ -170,8 +174,10 @@
         Private slot called when the process finished or the user pressed
         the button.
         """
-        if self.process is not None and \
-           self.process.state() != QProcess.NotRunning:
+        if (
+            self.process is not None and
+            self.process.state() != QProcess.NotRunning
+        ):
             self.process.terminate()
             QTimer.singleShot(2000, self.process.kill)
             self.process.waitForFinished(3000)