eric: comparison eric6/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py

-:3ead033becb8
+:c4b5f3393d63
 import os
 from PyQt5.QtCore import QTimer, QProcess, QRegExp, Qt, pyqtSlot
-from PyQt5.QtWidgets import QWidget, QHeaderView, QLineEdit, QApplication, \
+from PyQt5.QtWidgets import (
-QMenu, QDialogButtonBox, QTreeWidgetItem
+QWidget, QHeaderView, QLineEdit, QApplication, QMenu, QDialogButtonBox,
+QTreeWidgetItem
+)
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
 from .Ui_SvnStatusDialog import Ui_SvnStatusDialog
 self.__lockinfoColumn = 7
 self.__upToDateColumn = 8
 self.__pathColumn = 12
 self.__lastColumn = self.statusList.columnCount()
-self.refreshButton = \
+self.refreshButton = self.buttonBox.addButton(
-self.buttonBox.addButton(self.tr("Refresh"),
+self.tr("Refresh"), QDialogButtonBox.ActionRole)
-QDialogButtonBox.ActionRole)
 self.refreshButton.setToolTip(
 self.tr("Press to refresh the status display"))
 self.refreshButton.setEnabled(False)
 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
 self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
 }
 self.rx_status = QRegExp(
 '(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+(\\S+)\\s+(.+)\\s*')
 # flags (8 or 9 anything), revision, changed rev, author, path
-self.rx_status2 = \
+self.rx_status2 = QRegExp('(.{8,9})\\s+(.+)\\s*')
-QRegExp('(.{8,9})\\s+(.+)\\s*')
 # flags (8 or 9 anything), path
-self.rx_changelist = \
+self.rx_changelist = QRegExp('--- \\S+ .([\\w\\s]+).:\\s+')
-QRegExp('--- \\S+ .([\\w\\s]+).:\\s+')
 # three dashes, Changelist (translated), quote,
 # changelist name, quote, :
 self.__nonverbose = True
 @param revision revision string (string)
 @param change revision of last change (string)
 @param author author of the last change (string)
 @param path path of the file or directory (string)
 """
-if self.__nonverbose and \
+if (
-status == " " and \
+self.__nonverbose and
-propStatus == " " and \
+status == " " and
-locked == " " and \
+propStatus == " " and
-history == " " and \
+locked == " " and
-switched == " " and \
+history == " " and
-lockinfo == " " and \
+switched == " " and
-uptodate == " " and \
+lockinfo == " " and
-self.currentChangelist == "":
+uptodate == " " and
+self.currentChangelist == ""
+):
 return
 if revision == "":
 rev = ""
 else:
 itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable)
 itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked)
 else:
 itm.setFlags(itm.flags() & ~Qt.ItemIsUserCheckable)
-self.hidePropertyStatusColumn = self.hidePropertyStatusColumn and \
+self.hidePropertyStatusColumn = (
+self.hidePropertyStatusColumn and
 propStatus == " "
-self.hideLockColumns = self.hideLockColumns and \
+)
-locked == " " and lockinfo == " "
+self.hideLockColumns = (
+self.hideLockColumns and
+locked == " " and
+lockinfo == " "
+)
 self.hideUpToDateColumn = self.hideUpToDateColumn and uptodate == " "
 self.hideHistoryColumn = self.hideHistoryColumn and history == " "
 self.hideSwitchedColumn = self.hideSwitchedColumn and switched == " "
 if statusText not in self.__statusFilters:
 """
 Protected slot implementing a close event handler.
 @param e close event (QCloseEvent)
 """
-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)
 e.accept()
 args = []
 args.append('status')
 self.vcs.addArguments(args, self.vcs.options['global'])
 self.vcs.addArguments(args, self.vcs.options['status'])
-if '--verbose' not in self.vcs.options['global'] and \
+if (
-'--verbose' not in self.vcs.options['status']:
+'--verbose' not in self.vcs.options['global'] and
+'--verbose' not in self.vcs.options['status']
+):
 args.append('--verbose')
 self.__nonverbose = True
 else:
 self.__nonverbose = False
-if '--show-updates' in self.vcs.options['status'] or \
+if (
-'-u' in self.vcs.options['status']:
+'--show-updates' in self.vcs.options['status'] or
+'-u' in self.vcs.options['status']
+):
 self.activateWindow()
 self.raise_()
 if isinstance(fn, list):
 self.dname, fnames = self.vcs.splitPathList(fn)
 self.vcs.addArguments(args, fnames)
 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)
 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
 @return list of all items with a modified status
 """
 modifiedItems = []
 for itm in self.statusList.selectedItems():
-if itm.text(self.__statusColumn) in self.modifiedIndicators or \
+if (
-itm.text(self.__propStatusColumn) in self.modifiedIndicators:
+itm.text(self.__statusColumn) in self.modifiedIndicators or
+itm.text(self.__propStatusColumn) in self.modifiedIndicators
+):
 modifiedItems.append(itm)
 return modifiedItems
 def __getUnversionedItems(self):
 """

Mercurial Repositories > eric / file comparison

comparison: eric6/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py

eric6/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py