eric: comparison Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py

-:1b59c4ba121e
+:8cd4d08fa9f6
 from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog
 import UI.PixmapCache
 import Preferences
 class SvnLogBrowserDialog(QDialog, Ui_SvnLogBrowserDialog):
 """
 Class implementing a dialog to browse the log history.
 """
-def __init__(self, vcs, parent = None):
+def __init__(self, vcs, parent=None):
 """
 Constructor
 @param vcs reference to the vcs object
 @param parent parent widget (QWidget)
 # path copied from followed by copied from revision
 self.rx_flags2 = QRegExp('   ([ADM]) (.*)\\s*')
 # three blanks followed by A or D or M followed by path
 self.flags = {
-'A' : self.trUtf8('Added'),
+'A': self.trUtf8('Added'),
-'D' : self.trUtf8('Deleted'),
+'D': self.trUtf8('Deleted'),
-'M' : self.trUtf8('Modified'),
+'M': self.trUtf8('Modified'),
 }
 self.buf = []        # buffer for stdout
 self.diff = None
 self.__started = False
 def __resortLog(self):
 """
 Private method to resort the log tree.
 """
 self.logTree.sortItems(self.logTree.sortColumn(),
 self.logTree.header().sortIndicatorOrder())
 def __resizeColumnsFiles(self):
 """
 Private method to resize the changed files tree columns.
 def __resortFiles(self):
 """
 Private method to resort the changed files tree.
 """
 sortColumn = self.filesTree.sortColumn()
 self.filesTree.sortItems(1,
 self.filesTree.header().sortIndicatorOrder())
 self.filesTree.sortItems(sortColumn,
 self.filesTree.header().sortIndicatorOrder())
 def __generateLogItem(self, author, date, message, revision, changedPaths):
 """
 Private method to generate a log tree entry.
 @param author author info (string)
 @param date date info (string)
 @param message text of the log message (list of strings)
 @param revision revision info (string)
 @param changedPaths list of dictionary objects containing
 info about the changed files/directories
 @return reference to the generated item (QTreeWidgetItem)
 """
 msg = []
 for line in message:
 msg.append(line.strip())
 itm = QTreeWidgetItem(self.logTree, [
 "{0:7}".format(revision),
 author,
 date,
 " ".join(msg),
 ])
 itm.setData(0, self.__messageRole, message)
 itm.setData(0, self.__changesRole, changedPaths)
 @param copyFrom path the file was copied from (None, string)
 @param copyRev revision the file was copied from (None, string)
 @return reference to the generated item (QTreeWidgetItem)
 """
 itm = QTreeWidgetItem(self.filesTree, [
 self.flags[action],
 path,
 copyFrom,
 copyRev,
 ])
 itm.setTextAlignment(3, Qt.AlignRight)
 return itm
-def __getLogEntries(self, startRev = None):
+def __getLogEntries(self, startRev=None):
 """
 Private method to retrieve log entries from the repository.
 @param startRev revision number to start from (integer, string)
 """
 Private method to process the buffered output of the svn log command.
 """
 ioEncoding = Preferences.getSystem("IOEncoding")
 noEntries = 0
-log = {"message" : []}
+log = {"message": []}
 changedPaths = []
 for s in self.buf:
 if self.rx_rev1.exactMatch(s):
 log["revision"] = self.rx_rev.cap(1)
-log["author"]   = self.rx_rev.cap(2)
+log["author"] = self.rx_rev.cap(2)
-log["date"]     = self.rx_rev.cap(3)
+log["date"] = self.rx_rev.cap(3)
 # number of lines is ignored
 elif self.rx_rev2.exactMatch(s):
 log["revision"] = self.rx_rev2.cap(1)
-log["author"]   = self.rx_rev2.cap(2)
+log["author"] = self.rx_rev2.cap(2)
-log["date"]     = self.rx_rev2.cap(3)
+log["date"] = self.rx_rev2.cap(3)
 # number of lines is ignored
 elif self.rx_flags1.exactMatch(s):
 changedPaths.append({\
-"action"            :
+"action":
 str(self.rx_flags1.cap(1).strip(), ioEncoding, 'replace'),
-"path"              :
+"path":
 str(self.rx_flags1.cap(2).strip(), ioEncoding, 'replace'),
-"copyfrom_path"     :
+"copyfrom_path":
 str(self.rx_flags1.cap(3).strip(), ioEncoding, 'replace'),
-"copyfrom_revision" :
+"copyfrom_revision":
 str(self.rx_flags1.cap(4).strip(), ioEncoding, 'replace'),
 })
 elif self.rx_flags2.exactMatch(s):
 changedPaths.append({\
-"action"            :
+"action":
 str(self.rx_flags2.cap(1).strip(), ioEncoding, 'replace'),
-"path"              :
+"path":
 str(self.rx_flags2.cap(2).strip(), ioEncoding, 'replace'),
-"copyfrom_path"     : "",
+"copyfrom_path": "",
-"copyfrom_revision" : "",
+"copyfrom_revision": "",
 })
 elif self.rx_sep1.exactMatch(s) or self.rx_sep2.exactMatch(s):
 if len(log) > 1:
 self.__generateLogItem(log["author"], log["date"],
 log["message"], log["revision"], changedPaths)
 dt = QDate.fromString(log["date"], Qt.ISODate)
 if not self.__maxDate.isValid() and not self.__minDate.isValid():
 self.__maxDate = dt
 self.__minDate = dt
 if self.__maxDate < dt:
 self.__maxDate = dt
 if self.__minDate > dt:
 self.__minDate = dt
 noEntries += 1
-log = {"message" : []}
+log = {"message": []}
 changedPaths = []
 else:
 if s.strip().endswith(":") or not s.strip():
 continue
 else:
 self.__filterLogsEnabled = True
 self.__filterLogs()
 def __readStdout(self):
 """
 Private slot to handle the readyReadStandardOutput signal.
 It reads the output of the process and inserts it into a buffer.
 """
 self.process.setReadChannel(QProcess.StandardOutput)
 while self.process.canReadLine():
 line = str(self.process.readLine(),
 Preferences.getSystem("IOEncoding"),
 'replace')
 self.buf.append(line)
 def __readStderr(self):
 """
 It reads the error output of the process and inserts it into the
 error pane.
 """
 if self.process is not None:
 self.errorGroup.show()
 s = str(self.process.readAllStandardError(),
 Preferences.getSystem("IOEncoding"),
 'replace')
 self.errors.insertPlainText(s)
 self.errors.ensureCursorVisible()
 def __diffRevisions(self, rev1, rev2):
 self.filesTree.clear()
 changes = current.data(0, self.__changesRole)
 if len(changes) > 0:
 for change in changes:
 self.__generateFileItem(change["action"], change["path"],
 change["copyfrom_path"], change["copyfrom_revision"])
 self.__resizeColumnsFiles()
 self.__resortFiles()
 self.diffPreviousButton.setEnabled(
 @pyqtSlot(bool)
 def on_stopCheckBox_clicked(self, checked):
 """
 Private slot called, when the stop on copy/move checkbox is clicked
 """
 self.vcs.getPlugin().setPreferences("StopLogOnCopy",
 self.stopCheckBox.isChecked())
 self.nextButton.setEnabled(True)
 self.limitSpinBox.setEnabled(True)
 def on_passwordCheckBox_toggled(self, isOn):

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py

Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py