Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py
src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py
- branch
- eric7
- changeset 9221
- bf71ee032bb4
- parent 9209
- b99e7fd55fd3
- child 9653
- e67609152c5e
equal
deleted
inserted
replaced
| 9220:e9e7eca7efee | 9221:bf71ee032bb4 |
|---|---|
| 16 class SvnRevisionSelectionDialog(QDialog, Ui_SvnRevisionSelectionDialog): | 16 class SvnRevisionSelectionDialog(QDialog, Ui_SvnRevisionSelectionDialog): |
| 17 """ | 17 """ |
| 18 Class implementing a dialog to enter the revisions for the svn diff | 18 Class implementing a dialog to enter the revisions for the svn diff |
| 19 command. | 19 command. |
| 20 """ | 20 """ |
| 21 | |
| 21 def __init__(self, parent=None): | 22 def __init__(self, parent=None): |
| 22 """ | 23 """ |
| 23 Constructor | 24 Constructor |
| 24 | 25 |
| 25 @param parent parent widget of the dialog (QWidget) | 26 @param parent parent widget of the dialog (QWidget) |
| 26 """ | 27 """ |
| 27 super().__init__(parent) | 28 super().__init__(parent) |
| 28 self.setupUi(self) | 29 self.setupUi(self) |
| 29 | 30 |
| 30 self.date1Edit.setDate(QDate.currentDate()) | 31 self.date1Edit.setDate(QDate.currentDate()) |
| 31 self.date2Edit.setDate(QDate.currentDate()) | 32 self.date2Edit.setDate(QDate.currentDate()) |
| 32 | 33 |
| 33 msh = self.minimumSizeHint() | 34 msh = self.minimumSizeHint() |
| 34 self.resize(max(self.width(), msh.width()), msh.height()) | 35 self.resize(max(self.width(), msh.width()), msh.height()) |
| 35 | 36 |
| 36 def __getRevision(self, no): | 37 def __getRevision(self, no): |
| 37 """ | 38 """ |
| 38 Private method to generate the revision. | 39 Private method to generate the revision. |
| 39 | 40 |
| 40 @param no revision number to generate (1 or 2) | 41 @param no revision number to generate (1 or 2) |
| 41 @return revision (integer or string) | 42 @return revision (integer or string) |
| 42 """ | 43 """ |
| 43 if no == 1: | 44 if no == 1: |
| 44 numberButton = self.number1Button | 45 numberButton = self.number1Button |
| 60 headButton = self.head2Button | 61 headButton = self.head2Button |
| 61 workingButton = self.working2Button | 62 workingButton = self.working2Button |
| 62 baseButton = self.base2Button | 63 baseButton = self.base2Button |
| 63 committedButton = self.committed2Button | 64 committedButton = self.committed2Button |
| 64 prevButton = self.prev2Button | 65 prevButton = self.prev2Button |
| 65 | 66 |
| 66 if numberButton.isChecked(): | 67 if numberButton.isChecked(): |
| 67 return numberSpinBox.value() | 68 return numberSpinBox.value() |
| 68 elif dateButton.isChecked(): | 69 elif dateButton.isChecked(): |
| 69 return "{{{0}}}".format( | 70 return "{{{0}}}".format( |
| 70 QDateTime(dateEdit.date(), timeEdit.time()) | 71 QDateTime(dateEdit.date(), timeEdit.time()).toString( |
| 71 .toString(Qt.DateFormat.ISODate)) | 72 Qt.DateFormat.ISODate |
| 73 ) | |
| 74 ) | |
| 72 elif headButton.isChecked(): | 75 elif headButton.isChecked(): |
| 73 return "HEAD" | 76 return "HEAD" |
| 74 elif workingButton.isChecked(): | 77 elif workingButton.isChecked(): |
| 75 return "WORKING" | 78 return "WORKING" |
| 76 elif baseButton.isChecked(): | 79 elif baseButton.isChecked(): |
| 77 return "BASE" | 80 return "BASE" |
| 78 elif committedButton.isChecked(): | 81 elif committedButton.isChecked(): |
| 79 return "COMMITTED" | 82 return "COMMITTED" |
| 80 elif prevButton.isChecked(): | 83 elif prevButton.isChecked(): |
| 81 return "PREV" | 84 return "PREV" |
| 82 | 85 |
| 83 return "" | 86 return "" |
| 84 | 87 |
| 85 def getRevisions(self): | 88 def getRevisions(self): |
| 86 """ | 89 """ |
| 87 Public method to get the revisions. | 90 Public method to get the revisions. |
| 88 | 91 |
| 89 @return list two integers or strings | 92 @return list two integers or strings |
| 90 """ | 93 """ |
| 91 rev1 = self.__getRevision(1) | 94 rev1 = self.__getRevision(1) |
| 92 rev2 = self.__getRevision(2) | 95 rev2 = self.__getRevision(2) |
| 93 | 96 |
| 94 return [rev1, rev2] | 97 return [rev1, rev2] |
