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

-:1b59c4ba121e
+:8cd4d08fa9f6
 from .SvnDiffDialog import SvnDiffDialog
 from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog
 import UI.PixmapCache
 class SvnLogBrowserDialog(QDialog, SvnDialogMixin, 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)
 self.__messageRole = Qt.UserRole
 self.__changesRole = Qt.UserRole + 1
 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.diff = None
 self.__lastRev = 0
 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 (integer)
 @param message text of the log message (string)
 @param revision revision info (string or pysvn.opt_revision_kind)
 @param changedPaths list of pysvn dictionary like objects containing
 info about the changed files/directories
 @return reference to the generated item (QTreeWidgetItem)
 """
 if revision == "":
 rev = ""
 self.__lastRev = 0
 if date == "":
 dt = ""
 else:
 dt = formatTime(date)
 itm = QTreeWidgetItem(self.logTree,
-[rev, author, dt," ".join(message.splitlines())]
+[rev, author, dt, " ".join(message.splitlines())]
 )
 changes = []
 for changedPath in changedPaths:
 if changedPath["copyfrom_path"] is None:
 if changedPath["copyfrom_revision"] is None:
 copyRev = ""
 else:
 copyRev = "{0:7d}".format(changedPath["copyfrom_revision"].number)
 change = {
-"action"            : changedPath["action"],
+"action": changedPath["action"],
-"path"              : changedPath["path"],
+"path": changedPath["path"],
-"copyfrom_path"     : copyPath,
+"copyfrom_path": copyPath,
-"copyfrom_revision" : copyRev,
+"copyfrom_revision": copyRev,
 }
 changes.append(change)
 itm.setData(0, self.__messageRole, message)
 itm.setData(0, self.__changesRole, changes)
 @param path path of the file in the repository (string)
 @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)
 """
 if fetched == 0:
 revstart = start
 else:
 revstart = pysvn.Revision(
 pysvn.opt_revision_kind.number, nextRev)
 allLogs = self.client.log(self.fname,
-revision_start = revstart,
+revision_start=revstart,
-discover_changed_paths = True,
+discover_changed_paths=True,
-limit = flimit + 1,
+limit=flimit + 1,
-strict_node_history = self.stopCheckBox.isChecked())
+strict_node_history=self.stopCheckBox.isChecked())
 if len(allLogs) <= flimit or self._clientCancelCallback():
 logs.extend(allLogs)
 break
 else:
 logs.extend(allLogs[:-1])
 nextRev = allLogs[-1]["revision"].number
 fetched += fetchLimit
 locker.unlock()
 for log in logs:
 self.__generateLogItem(log["author"], log["date"],
 log["message"], log["revision"], log['changed_paths'])
 dt = dateFromTime_t(log["date"])
 if not self.__maxDate.isValid() and not self.__minDate.isValid():
 self.__maxDate = dt
 self.__minDate = dt
 """
 if self.diff is None:
 self.diff = SvnDiffDialog(self.vcs)
 self.diff.show()
 QApplication.processEvents()
-self.diff.start(self.filename, [rev1, rev2], pegRev = peg_rev)
+self.diff.start(self.filename, [rev1, rev2], pegRev=peg_rev)
 def on_buttonBox_clicked(self, button):
 """
 Private slot called by a button of the button box clicked.
 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",
 int(self.stopCheckBox.isChecked()))
 self.nextButton.setEnabled(True)
 self.limitSpinBox.setEnabled(True)

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py

Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py