Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py
- branch
- Py2 comp.
- changeset 3058
- 0a02c433f52d
- parent 3057
- 10516539f238
- parent 3025
- 67064c71df21
- child 3060
- 5883ce99ee12
equal
deleted
inserted
replaced
| 3057:10516539f238 | 3058:0a02c433f52d |
|---|---|
| 129 | 129 |
| 130 def __resortLog(self): | 130 def __resortLog(self): |
| 131 """ | 131 """ |
| 132 Private method to resort the log tree. | 132 Private method to resort the log tree. |
| 133 """ | 133 """ |
| 134 self.logTree.sortItems(self.logTree.sortColumn(), | 134 self.logTree.sortItems( |
| 135 self.logTree.sortColumn(), | |
| 135 self.logTree.header().sortIndicatorOrder()) | 136 self.logTree.header().sortIndicatorOrder()) |
| 136 | 137 |
| 137 def __resizeColumnsFiles(self): | 138 def __resizeColumnsFiles(self): |
| 138 """ | 139 """ |
| 139 Private method to resize the changed files tree columns. | 140 Private method to resize the changed files tree columns. |
| 144 def __resortFiles(self): | 145 def __resortFiles(self): |
| 145 """ | 146 """ |
| 146 Private method to resort the changed files tree. | 147 Private method to resort the changed files tree. |
| 147 """ | 148 """ |
| 148 sortColumn = self.filesTree.sortColumn() | 149 sortColumn = self.filesTree.sortColumn() |
| 149 self.filesTree.sortItems(1, | 150 self.filesTree.sortItems( |
| 150 self.filesTree.header().sortIndicatorOrder()) | 151 1, self.filesTree.header().sortIndicatorOrder()) |
| 151 self.filesTree.sortItems(sortColumn, | 152 self.filesTree.sortItems( |
| 152 self.filesTree.header().sortIndicatorOrder()) | 153 sortColumn, self.filesTree.header().sortIndicatorOrder()) |
| 153 | 154 |
| 154 def __generateLogItem(self, author, date, message, revision, changedPaths): | 155 def __generateLogItem(self, author, date, message, revision, changedPaths): |
| 155 """ | 156 """ |
| 156 Private method to generate a log tree entry. | 157 Private method to generate a log tree entry. |
| 157 | 158 |
| 253 self.process.start('svn', args) | 254 self.process.start('svn', args) |
| 254 procStarted = self.process.waitForStarted(5000) | 255 procStarted = self.process.waitForStarted(5000) |
| 255 if not procStarted: | 256 if not procStarted: |
| 256 self.inputGroup.setEnabled(False) | 257 self.inputGroup.setEnabled(False) |
| 257 self.inputGroup.hide() | 258 self.inputGroup.hide() |
| 258 E5MessageBox.critical(self, | 259 E5MessageBox.critical( |
| 260 self, | |
| 259 self.trUtf8('Process Generation Error'), | 261 self.trUtf8('Process Generation Error'), |
| 260 self.trUtf8( | 262 self.trUtf8( |
| 261 'The process {0} could not be started. ' | 263 'The process {0} could not be started. ' |
| 262 'Ensure, that it is in the search path.' | 264 'Ensure, that it is in the search path.' |
| 263 ).format('svn')) | 265 ).format('svn')) |
| 349 "copyfrom_path": "", | 351 "copyfrom_path": "", |
| 350 "copyfrom_revision": "", | 352 "copyfrom_revision": "", |
| 351 }) | 353 }) |
| 352 elif self.rx_sep1.exactMatch(s) or self.rx_sep2.exactMatch(s): | 354 elif self.rx_sep1.exactMatch(s) or self.rx_sep2.exactMatch(s): |
| 353 if len(log) > 1: | 355 if len(log) > 1: |
| 354 self.__generateLogItem(log["author"], log["date"], | 356 self.__generateLogItem( |
| 355 log["message"], log["revision"], changedPaths) | 357 log["author"], log["date"], log["message"], |
| 358 log["revision"], changedPaths) | |
| 356 dt = QDate.fromString(log["date"], Qt.ISODate) | 359 dt = QDate.fromString(log["date"], Qt.ISODate) |
| 357 if not self.__maxDate.isValid() and \ | 360 if not self.__maxDate.isValid() and \ |
| 358 not self.__minDate.isValid(): | 361 not self.__minDate.isValid(): |
| 359 self.__maxDate = dt | 362 self.__maxDate = dt |
| 360 self.__minDate = dt | 363 self.__minDate = dt |
| 466 | 469 |
| 467 self.filesTree.clear() | 470 self.filesTree.clear() |
| 468 changes = current.data(0, self.__changesRole) | 471 changes = current.data(0, self.__changesRole) |
| 469 if len(changes) > 0: | 472 if len(changes) > 0: |
| 470 for change in changes: | 473 for change in changes: |
| 471 self.__generateFileItem(change["action"], change["path"], | 474 self.__generateFileItem( |
| 472 change["copyfrom_path"], change["copyfrom_revision"]) | 475 change["action"], change["path"], change["copyfrom_path"], |
| 476 change["copyfrom_revision"]) | |
| 473 self.__resizeColumnsFiles() | 477 self.__resizeColumnsFiles() |
| 474 self.__resortFiles() | 478 self.__resortFiles() |
| 475 | 479 |
| 476 self.diffPreviousButton.setEnabled( | 480 self.diffPreviousButton.setEnabled( |
| 477 current != self.logTree.topLevelItem( | 481 current != self.logTree.topLevelItem( |
