eric: comparison eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

-:4ef3b78ebb4e
+:c4d0cac9b5c9
 import os
 import re
 import collections
-from PyQt5.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \
+from PyQt5.QtCore import (
-QSize, QPoint, QFileInfo
+pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, QSize, QPoint, QFileInfo
-from PyQt5.QtGui import QCursor, QColor, QPixmap, QPainter, QPen, QBrush, \
+)
-QIcon, QTextCursor
+from PyQt5.QtGui import (
-from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QHeaderView, \
+QCursor, QColor, QPixmap, QPainter, QPen, QBrush, QIcon, QTextCursor
-QTreeWidgetItem, QApplication, QLineEdit, QMenu, QInputDialog
+)
+from PyQt5.QtWidgets import (
+QWidget, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QApplication,
+QLineEdit, QMenu, QInputDialog
+)
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
 from .Ui_HgLogBrowserDialog import Ui_HgLogBrowserDialog
 """
 if self.__hgClient:
 if self.__hgClient.isExecuting():
 self.__hgClient.cancel()
 else:
-if self.process is not None and \
+if (
-self.process.state() != QProcess.NotRunning:
+self.process is not None and
+self.process.state() != QProcess.NotRunning
+):
 self.process.terminate()
 QTimer.singleShot(2000, self.process.kill)
 self.process.waitForFinished(3000)
 self.vcs.getPlugin().setPreferences(
 args = self.vcs.initCommand("parents")
 if self.commandMode == "incoming":
 if self.__bundle:
 args.append("--repository")
 args.append(self.__bundle)
-elif self.vcs.bundleFile and \
+elif (
-os.path.exists(self.vcs.bundleFile):
+self.vcs.bundleFile and
+os.path.exists(self.vcs.bundleFile)
+):
 args.append("--repository")
 args.append(self.vcs.bundleFile)
 args.append("--template")
 args.append("{rev}\n")
 args.append("-r")
 for parent in parents:
 self.__childrenInfo[parent].append(int(rev))
 itm.setData(0, self.__incomingRole, self.commandMode == "incoming")
 if self.logTree.topLevelItemCount() > 1:
-topedges = \
+topedges = self.logTree.topLevelItem(
-self.logTree.topLevelItem(
+self.logTree.indexOfTopLevelItem(itm) - 1
-self.logTree.indexOfTopLevelItem(itm) - 1)\
+).data(0, self.__edgesRole)
-.data(0, self.__edgesRole)
 else:
 topedges = None
 icon = self.__generateIcon(column, color, edges, topedges,
 QColor(self.__branchColor(branches[0])),
 if self.vcs.hasSubrepositories():
 args.append("--subrepos")
 if startRev is not None:
 args.append('--rev')
 args.append('{0}:0'.format(startRev))
-if not self.projectMode and \
+if (
-not self.fname == "." and \
+not self.projectMode and
-not self.stopCheckBox.isChecked():
+not self.fname == "." and
+not self.stopCheckBox.isChecked()
+):
 args.append('--follow')
 if self.commandMode == "log":
 args.append('--copies')
 args.append('--template')
 args.append(os.path.join(os.path.dirname(__file__),
 if preargs:
 out, err = self.__hgClient.runcommand(preargs)
 else:
 err = ""
 if err:
-if self.commandMode == "incoming" and \
+if (
-self.initialCommandMode == "full_log":
+self.commandMode == "incoming" and
+self.initialCommandMode == "full_log"
+):
 # ignore the error
 self.commandMode = "log"
 else:
 self.__showError(err)
-elif self.commandMode != "incoming" or \
+elif (
+self.commandMode != "incoming" or
 (self.vcs.bundleFile and
-os.path.exists(self.vcs.bundleFile)) or \
+os.path.exists(self.vcs.bundleFile)) or
-self.__bundle:
+self.__bundle
+):
 out, err = self.__hgClient.runcommand(args)
 self.buf = out.splitlines(True)
 if err:
 self.__showError(err)
 self.__processBuffer()
-elif self.commandMode == "incoming" and \
+elif (
-self.initialCommandMode == "full_log":
+self.commandMode == "incoming" and
+self.initialCommandMode == "full_log"
+):
 # no incoming changesets, just switch to log mode
 self.commandMode = "log"
 self.__finish()
 else:
 self.process.kill()
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 process.waitForFinished(30000)
-if self.commandMode != "incoming" or \
+if (
+self.commandMode != "incoming" or
 (self.vcs.bundleFile and
-os.path.exists(self.vcs.bundleFile)) or \
+os.path.exists(self.vcs.bundleFile)) or
-self.__bundle:
+self.__bundle
+):
 self.process.start('hg', args)
 procStarted = self.process.waitForStarted(5000)
 if not procStarted:
 self.inputGroup.setEnabled(False)
 self.inputGroup.hide()
 def __finish(self):
 """
 Private slot called when the process finished or the user pressed
 the button.
 """
-if self.process is not None and \
+if (
-self.process.state() != QProcess.NotRunning:
+self.process is not None and
+self.process.state() != QProcess.NotRunning
+):
 self.process.terminate()
 QTimer.singleShot(2000, self.process.kill)
 self.process.waitForFinished(3000)
 QApplication.restoreOverrideCursor()
 initialText = False
 log["revision"] = value.strip()
 elif key == "user":
 log["author"] = value.strip()
 elif key == "parents":
-log["parents"] = \
+log["parents"] = [
-[int(x.split(":", 1)[0])
+int(x.split(":", 1)[0])
-for x in value.strip().split()]
+for x in value.strip().split()
+]
 elif key == "date":
 log["date"] = " ".join(value.strip().split()[:2])
 elif key == "description":
 log["message"].append(value.strip())
 elif key == "file_adds":
 log["author"], log["date"],
 log["message"], log["revision"], changedPaths,
 log["parents"], log["branches"], log["tags"],
 log["phase"], log["bookmarks"], log["latesttag"])
 dt = QDate.fromString(log["date"], Qt.ISODate)
-if not self.__maxDate.isValid() and \
+if (
-not self.__minDate.isValid():
+not self.__maxDate.isValid() and
+not self.__minDate.isValid()
+):
 self.__maxDate = dt
 self.__minDate = dt
 else:
 if self.__maxDate < dt:
 self.__maxDate = dt
 self.sbsSelectLabel.clear()
 if self.__isFile:
 selectedItems = self.logTree.selectedItems()
 if len(selectedItems) == 1:
 currentItem = selectedItems[0]
-rev2 = currentItem.text(self.RevisionColumn).split(":", 1)[0]\
+rev2 = (
+currentItem.text(self.RevisionColumn).split(":", 1)[0]
 .strip()
+)
 parents = currentItem.data(0, self.__parentsRole)
 if parents:
 parentLinks = []
 for index in range(len(parents)):
 parentLinks.append(
 secret += 1
 else:
 public += 1
 # step 2: set the status of the phase action
-if public == 0 and \
+if (
-((secret > 0 and draft == 0) or
+public == 0 and
-(secret == 0 and draft > 0)):
+((secret > 0 and draft == 0) or
+(secret == 0 and draft > 0))
+):
 self.__phaseAct.setEnabled(True)
 else:
 self.__phaseAct.setEnabled(False)
 # do the graft action
 self.__diffUpdatesFiles = True
 index1 = self.logTree.indexOfTopLevelItem(selectedItems[0])
 index2 = self.logTree.indexOfTopLevelItem(selectedItems[1])
 if index1 > index2:
 # Swap the entries
-selectedItems[0], selectedItems[1] = \
+selectedItems[0], selectedItems[1] = (
 selectedItems[1], selectedItems[0]
+)
 html = "{0}<hr/>{1}".format(
 self.__generateDetailsTableText(selectedItems[0]),
 self.__generateDetailsTableText(selectedItems[1]),
 )
 self.detailsEdit.setHtml(html)
 else:
 # Find based on complete message text
 txt = "\n".join(topItem.data(0, self.__messageRole))
 else:
 txt = topItem.text(fieldIndex)
-if topItem.text(self.DateColumn) <= to_ and \
+if (
-topItem.text(self.DateColumn) >= from_ and \
+topItem.text(self.DateColumn) <= to_ and
-(branch == self.__allBranchesFilter or
+topItem.text(self.DateColumn) >= from_ and
-topItem.text(self.BranchColumn) in
+(branch == self.__allBranchesFilter or
-[branch, closedBranch]) and \
+topItem.text(self.BranchColumn) in
-searchRx.indexIn(txt) > -1:
+[branch, closedBranch]) and
+searchRx.indexIn(txt) > -1
+):
 topItem.setHidden(False)
 if topItem is currentItem:
 self.on_logTree_currentItemChanged(topItem, None)
 else:
 topItem.setHidden(True)
 Private slot to bookmark the selected revision.
 """
 if len([itm for itm in self.logTree.selectedItems()
 if not itm.data(0, self.__incomingRole)]) == 1:
 itm = self.logTree.selectedItems()[0]
-rev, changeset = \
+rev, changeset = (
 itm.text(self.RevisionColumn).strip().split(":", 1)
+)
 bookmark, ok = QInputDialog.getText(
 self,
 self.tr("Define Bookmark"),
 self.tr('Enter bookmark name for changeset "{0}":').format(
 changeset),
 Private slot to move a bookmark to the selected revision.
 """
 if len([itm for itm in self.logTree.selectedItems()
 if not itm.data(0, self.__incomingRole)]) == 1:
 itm = self.logTree.selectedItems()[0]
-rev, changeset = \
+rev, changeset = (
 itm.text(self.RevisionColumn).strip().split(":", 1)
+)
 bookmarksList = self.vcs.hgGetBookmarksList(self.repodir)
 bookmark, ok = QInputDialog.getItem(
 self,
 self.tr("Move Bookmark"),
 self.tr('Select the bookmark to be moved  to changeset'
 "base": "",
 "all": True,
 }
 elif len(selectedItems) == 1:
 # the selected changeset is the base
-rev = selectedItems[0].text(self.RevisionColumn)\
+rev = selectedItems[0].text(self.RevisionColumn).split(
-.split(":", 1)[0].strip()
+":", 1)[0].strip()
 bundleData = {
 "revs": [],
 "base": rev,
 "all": False,
 }

Mercurial Repositories > eric / file comparison

comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py