Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Sat Sep 21 20:30:56 2019 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Sat Sep 21 22:03:03 2019 +0200
@@ -14,8 +14,10 @@
 
 from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer, QSize
 from PyQt5.QtGui import QTextCursor
-from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QMenu, QHeaderView, \
-    QTreeWidgetItem, QLineEdit, QInputDialog
+from PyQt5.QtWidgets import (
+    QWidget, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem, QLineEdit,
+    QInputDialog
+)
 
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
@@ -264,8 +266,10 @@
         
         @param e close event (QCloseEvent)
         """
-        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)
@@ -337,8 +341,10 @@
         itm.setTextAlignment(self.__statusIndexColumn, Qt.AlignHCenter)
         itm.setTextAlignment(self.__pathColumn, Qt.AlignLeft)
     
-        if status not in self.ConflictStates + ["??", "!!"] and \
-                statusIndexText in self.modifiedIndicators:
+        if (
+            status not in self.ConflictStates + ["??", "!!"] and
+            statusIndexText in self.modifiedIndicators
+        ):
             itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable)
             itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked)
         else:
@@ -420,8 +426,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)
@@ -912,8 +920,10 @@
         items = []
         for index in range(self.statusList.topLevelItemCount()):
             itm = self.statusList.topLevelItem(index)
-            if itm.flags() & Qt.ItemIsUserCheckable and \
-               itm.checkState(self.__toBeCommittedColumn) == Qt.Unchecked:
+            if (
+                itm.flags() & Qt.ItemIsUserCheckable and
+                itm.checkState(self.__toBeCommittedColumn) == Qt.Unchecked
+            ):
                 items.append(itm)
         return items
     
@@ -969,8 +979,10 @@
         """
         stageableItems = []
         for itm in self.statusList.selectedItems():
-            if itm.text(self.__statusWorkColumn) in \
-                    self.modifiedIndicators + self.unmergedIndicators:
+            if (
+                itm.text(self.__statusWorkColumn) in
+                self.modifiedIndicators + self.unmergedIndicators
+            ):
                 stageableItems.append(itm)
         return stageableItems