diff -r 4ef3b78ebb4e -r c4d0cac9b5c9 eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.py
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sat Sep 21 20:30:56 2019 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sat Sep 21 22:03:03 2019 +0200
@@ -10,8 +10,9 @@
import os
-from PyQt5.QtCore import QProcess, QTimer, pyqtSlot, Qt, QCoreApplication, \
- QProcessEnvironment
+from PyQt5.QtCore import (
+ QProcess, QTimer, pyqtSlot, Qt, QCoreApplication, QProcessEnvironment
+)
from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QLineEdit
from E5Gui import E5MessageBox
@@ -67,8 +68,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)
@@ -84,9 +87,11 @@
self.buttonBox.button(QDialogButtonBox.Close).setFocus(
Qt.OtherFocusReason)
- if Preferences.getVCS("AutoClose") and \
- self.normal and \
- self.errors.toPlainText() == "":
+ if (
+ Preferences.getVCS("AutoClose") and
+ self.normal and
+ self.errors.toPlainText() == ""
+ ):
self.accept()
def on_buttonBox_clicked(self, button):
@@ -130,11 +135,13 @@
self.intercept = False
self.__hasAddOrDelete = False
- if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase",
- "update", "import", "revert", "graft", "shelve",
- "unshelve", "strip", "histedit"] or \
- (args[0] in ["pull", "unbundle"] and
- ("--update" in args[1:] or "--rebase" in args[1:])):
+ if (
+ args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase",
+ "update", "import", "revert", "graft", "shelve",
+ "unshelve", "strip", "histedit"] or
+ (args[0] in ["pull", "unbundle"] and
+ ("--update" in args[1:] or "--rebase" in args[1:]))
+ ):
self.__updateCommand = True
else:
self.__updateCommand = False
