Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py
eric6/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py
- branch
- maintenance
- changeset 8273
- 698ae46f40a4
- parent 8176
- 31965986ecd1
- parent 8222
- 5994b80b8760
equal
deleted
inserted
replaced
| 8190:fb0ef164f536 | 8273:698ae46f40a4 |
|---|---|
| 35 Constructor | 35 Constructor |
| 36 | 36 |
| 37 @param vcs reference to the vcs object | 37 @param vcs reference to the vcs object |
| 38 @param parent parent widget (QWidget) | 38 @param parent parent widget (QWidget) |
| 39 """ | 39 """ |
| 40 super(SvnLogBrowserDialog, self).__init__(parent) | 40 super().__init__(parent) |
| 41 self.setupUi(self) | 41 self.setupUi(self) |
| 42 | 42 |
| 43 self.__position = QPoint() | 43 self.__position = QPoint() |
| 44 | 44 |
| 45 self.buttonBox.button( | 45 self.buttonBox.button( |
| 154 """ | 154 """ |
| 155 if not self.__position.isNull(): | 155 if not self.__position.isNull(): |
| 156 self.move(self.__position) | 156 self.move(self.__position) |
| 157 self.__resetUI() | 157 self.__resetUI() |
| 158 | 158 |
| 159 super(SvnLogBrowserDialog, self).show() | 159 super().show() |
| 160 | 160 |
| 161 def __resetUI(self): | 161 def __resetUI(self): |
| 162 """ | 162 """ |
| 163 Private method to reset the user interface. | 163 Private method to reset the user interface. |
| 164 """ | 164 """ |
| 428 "path": match.group(2).strip(), | 428 "path": match.group(2).strip(), |
| 429 "copyfrom_path": "", | 429 "copyfrom_path": "", |
| 430 "copyfrom_revision": "", | 430 "copyfrom_revision": "", |
| 431 }) | 431 }) |
| 432 elif ( | 432 elif ( |
| 433 match.re is self.rx_sep1 or | 433 (match.re is self.rx_sep1 or match.re is self.rx_sep2) and |
| 434 match.re is self.rx_sep2 | 434 len(log) > 1 |
| 435 ): | 435 ): |
| 436 if len(log) > 1: | 436 self.__generateLogItem( |
| 437 self.__generateLogItem( | 437 log["author"], log["date"], log["message"], |
| 438 log["author"], log["date"], log["message"], | 438 log["revision"], changedPaths) |
| 439 log["revision"], changedPaths) | 439 dt = QDate.fromString(log["date"], Qt.DateFormat.ISODate) |
| 440 dt = QDate.fromString(log["date"], Qt.DateFormat.ISODate) | 440 if ( |
| 441 if ( | 441 not self.__maxDate.isValid() and |
| 442 not self.__maxDate.isValid() and | 442 not self.__minDate.isValid() |
| 443 not self.__minDate.isValid() | 443 ): |
| 444 ): | 444 self.__maxDate = dt |
| 445 self.__minDate = dt | |
| 446 else: | |
| 447 if self.__maxDate < dt: | |
| 445 self.__maxDate = dt | 448 self.__maxDate = dt |
| 449 if self.__minDate > dt: | |
| 446 self.__minDate = dt | 450 self.__minDate = dt |
| 447 else: | 451 noEntries += 1 |
| 448 if self.__maxDate < dt: | 452 log = {"message": []} |
| 449 self.__maxDate = dt | 453 changedPaths = [] |
| 450 if self.__minDate > dt: | |
| 451 self.__minDate = dt | |
| 452 noEntries += 1 | |
| 453 log = {"message": []} | |
| 454 changedPaths = [] | |
| 455 | 454 |
| 456 self.__resizeColumnsLog() | 455 self.__resizeColumnsLog() |
| 457 self.__resortLog() | 456 self.__resortLog() |
| 458 | 457 |
| 459 if self.__started: | 458 if self.__started: |
| 787 """ | 786 """ |
| 788 if self.intercept: | 787 if self.intercept: |
| 789 self.intercept = False | 788 self.intercept = False |
| 790 evt.accept() | 789 evt.accept() |
| 791 return | 790 return |
| 792 super(SvnLogBrowserDialog, self).keyPressEvent(evt) | 791 super().keyPressEvent(evt) |
