Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py
- branch
- eric7
- changeset 9221
- bf71ee032bb4
- parent 9209
- b99e7fd55fd3
- child 9473
- 3f23dbf37dbe
equal
deleted
inserted
replaced
| 9220:e9e7eca7efee | 9221:bf71ee032bb4 |
|---|---|
| 15 | 15 |
| 16 class HgRebaseDialog(QDialog, Ui_HgRebaseDialog): | 16 class HgRebaseDialog(QDialog, Ui_HgRebaseDialog): |
| 17 """ | 17 """ |
| 18 Class implementing a dialog to enter the data for a rebase session. | 18 Class implementing a dialog to enter the data for a rebase session. |
| 19 """ | 19 """ |
| 20 def __init__(self, tagsList, branchesList, bookmarksList, version, | 20 |
| 21 parent=None): | 21 def __init__(self, tagsList, branchesList, bookmarksList, version, parent=None): |
| 22 """ | 22 """ |
| 23 Constructor | 23 Constructor |
| 24 | 24 |
| 25 @param tagsList list of tags | 25 @param tagsList list of tags |
| 26 @type list of str | 26 @type list of str |
| 27 @param branchesList list of branches | 27 @param branchesList list of branches |
| 28 @type list of str | 28 @type list of str |
| 29 @param bookmarksList list of bookmarks | 29 @param bookmarksList list of bookmarks |
| 33 @param parent reference to the parent widget | 33 @param parent reference to the parent widget |
| 34 @type QWidget | 34 @type QWidget |
| 35 """ | 35 """ |
| 36 super().__init__(parent) | 36 super().__init__(parent) |
| 37 self.setupUi(self) | 37 self.setupUi(self) |
| 38 | 38 |
| 39 self.__sourceRevisionButtonGroup = QButtonGroup(self) | 39 self.__sourceRevisionButtonGroup = QButtonGroup(self) |
| 40 self.__sourceRevisionButtonGroup.addButton(self.parentButton) | 40 self.__sourceRevisionButtonGroup.addButton(self.parentButton) |
| 41 self.__sourceRevisionButtonGroup.addButton(self.sourceButton) | 41 self.__sourceRevisionButtonGroup.addButton(self.sourceButton) |
| 42 self.__sourceRevisionButtonGroup.addButton(self.baseButton) | 42 self.__sourceRevisionButtonGroup.addButton(self.baseButton) |
| 43 | 43 |
| 44 self.tag1Combo.addItems(sorted(tagsList)) | 44 self.tag1Combo.addItems(sorted(tagsList)) |
| 45 self.tag2Combo.addItems(sorted(tagsList)) | 45 self.tag2Combo.addItems(sorted(tagsList)) |
| 46 self.branch1Combo.addItems(["default"] + sorted(branchesList)) | 46 self.branch1Combo.addItems(["default"] + sorted(branchesList)) |
| 47 self.branch2Combo.addItems(["default"] + sorted(branchesList)) | 47 self.branch2Combo.addItems(["default"] + sorted(branchesList)) |
| 48 self.bookmark1Combo.addItems(sorted(bookmarksList)) | 48 self.bookmark1Combo.addItems(sorted(bookmarksList)) |
| 49 self.bookmark2Combo.addItems(sorted(bookmarksList)) | 49 self.bookmark2Combo.addItems(sorted(bookmarksList)) |
| 50 | 50 |
| 51 self.dryRunGroup.setEnabled(version >= (4, 7, 0)) | 51 self.dryRunGroup.setEnabled(version >= (4, 7, 0)) |
| 52 | 52 |
| 53 # connect various radio buttons and input fields | 53 # connect various radio buttons and input fields |
| 54 self.id1Button.toggled.connect(self.__updateOK) | 54 self.id1Button.toggled.connect(self.__updateOK) |
| 55 self.tag1Button.toggled.connect(self.__updateOK) | 55 self.tag1Button.toggled.connect(self.__updateOK) |
| 56 self.branch1Button.toggled.connect(self.__updateOK) | 56 self.branch1Button.toggled.connect(self.__updateOK) |
| 57 self.bookmark1Button.toggled.connect(self.__updateOK) | 57 self.bookmark1Button.toggled.connect(self.__updateOK) |
| 59 self.id2Button.toggled.connect(self.__updateOK) | 59 self.id2Button.toggled.connect(self.__updateOK) |
| 60 self.tag2Button.toggled.connect(self.__updateOK) | 60 self.tag2Button.toggled.connect(self.__updateOK) |
| 61 self.branch2Button.toggled.connect(self.__updateOK) | 61 self.branch2Button.toggled.connect(self.__updateOK) |
| 62 self.bookmark2Button.toggled.connect(self.__updateOK) | 62 self.bookmark2Button.toggled.connect(self.__updateOK) |
| 63 self.expression2Button.toggled.connect(self.__updateOK) | 63 self.expression2Button.toggled.connect(self.__updateOK) |
| 64 | 64 |
| 65 self.id1Edit.textChanged.connect(self.__updateOK) | 65 self.id1Edit.textChanged.connect(self.__updateOK) |
| 66 self.expression1Edit.textChanged.connect(self.__updateOK) | 66 self.expression1Edit.textChanged.connect(self.__updateOK) |
| 67 self.id2Edit.textChanged.connect(self.__updateOK) | 67 self.id2Edit.textChanged.connect(self.__updateOK) |
| 68 self.expression2Edit.textChanged.connect(self.__updateOK) | 68 self.expression2Edit.textChanged.connect(self.__updateOK) |
| 69 | 69 |
| 70 self.tag1Combo.editTextChanged.connect(self.__updateOK) | 70 self.tag1Combo.editTextChanged.connect(self.__updateOK) |
| 71 self.branch1Combo.editTextChanged.connect(self.__updateOK) | 71 self.branch1Combo.editTextChanged.connect(self.__updateOK) |
| 72 self.bookmark1Combo.editTextChanged.connect(self.__updateOK) | 72 self.bookmark1Combo.editTextChanged.connect(self.__updateOK) |
| 73 self.tag2Combo.editTextChanged.connect(self.__updateOK) | 73 self.tag2Combo.editTextChanged.connect(self.__updateOK) |
| 74 self.branch2Combo.editTextChanged.connect(self.__updateOK) | 74 self.branch2Combo.editTextChanged.connect(self.__updateOK) |
| 75 self.bookmark2Combo.editTextChanged.connect(self.__updateOK) | 75 self.bookmark2Combo.editTextChanged.connect(self.__updateOK) |
| 76 | 76 |
| 77 msh = self.minimumSizeHint() | 77 msh = self.minimumSizeHint() |
| 78 self.resize(max(self.width(), msh.width()), msh.height()) | 78 self.resize(max(self.width(), msh.width()), msh.height()) |
| 79 | 79 |
| 80 @pyqtSlot() | 80 @pyqtSlot() |
| 81 def __updateOK(self): | 81 def __updateOK(self): |
| 82 """ | 82 """ |
| 83 Private slot to update the OK button. | 83 Private slot to update the OK button. |
| 84 """ | 84 """ |
| 92 enabled = enabled and bool(self.branch1Combo.currentText()) | 92 enabled = enabled and bool(self.branch1Combo.currentText()) |
| 93 elif self.bookmark1Button.isChecked(): | 93 elif self.bookmark1Button.isChecked(): |
| 94 enabled = enabled and bool(self.bookmark1Combo.currentText()) | 94 enabled = enabled and bool(self.bookmark1Combo.currentText()) |
| 95 elif self.expression1Button.isChecked(): | 95 elif self.expression1Button.isChecked(): |
| 96 enabled = enabled and bool(self.expression1Edit.text()) | 96 enabled = enabled and bool(self.expression1Edit.text()) |
| 97 | 97 |
| 98 if self.id2Button.isChecked(): | 98 if self.id2Button.isChecked(): |
| 99 enabled = enabled and bool(self.id2Edit.text()) | 99 enabled = enabled and bool(self.id2Edit.text()) |
| 100 elif self.tag2Button.isChecked(): | 100 elif self.tag2Button.isChecked(): |
| 101 enabled = enabled and bool(self.tag2Combo.currentText()) | 101 enabled = enabled and bool(self.tag2Combo.currentText()) |
| 102 elif self.branch2Button.isChecked(): | 102 elif self.branch2Button.isChecked(): |
| 103 enabled = enabled and bool(self.branch2Combo.currentText()) | 103 enabled = enabled and bool(self.branch2Combo.currentText()) |
| 104 elif self.bookmark2Button.isChecked(): | 104 elif self.bookmark2Button.isChecked(): |
| 105 enabled = enabled and bool(self.bookmark2Combo.currentText()) | 105 enabled = enabled and bool(self.bookmark2Combo.currentText()) |
| 106 elif self.expression2Button.isChecked(): | 106 elif self.expression2Button.isChecked(): |
| 107 enabled = enabled and bool(self.expression2Edit.text()) | 107 enabled = enabled and bool(self.expression2Edit.text()) |
| 108 | 108 |
| 109 self.buttonBox.button( | 109 self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(enabled) |
| 110 QDialogButtonBox.StandardButton.Ok).setEnabled(enabled) | 110 |
| 111 | |
| 112 def __getRevision(self, no): | 111 def __getRevision(self, no): |
| 113 """ | 112 """ |
| 114 Private method to generate the revision. | 113 Private method to generate the revision. |
| 115 | 114 |
| 116 @param no revision number to generate (1 or 2) | 115 @param no revision number to generate (1 or 2) |
| 117 @type int | 116 @type int |
| 118 @return revision | 117 @return revision |
| 119 @rtype str | 118 @rtype str |
| 120 """ | 119 """ |
| 144 bookmarkButton = self.bookmark2Button | 143 bookmarkButton = self.bookmark2Button |
| 145 bookmarkCombo = self.bookmark2Combo | 144 bookmarkCombo = self.bookmark2Combo |
| 146 expressionButton = self.expression2Button | 145 expressionButton = self.expression2Button |
| 147 expressionEdit = self.expression2Edit | 146 expressionEdit = self.expression2Edit |
| 148 tipButton = self.tip2Button | 147 tipButton = self.tip2Button |
| 149 | 148 |
| 150 if numberButton.isChecked(): | 149 if numberButton.isChecked(): |
| 151 return "rev({0})".format(numberSpinBox.value()) | 150 return "rev({0})".format(numberSpinBox.value()) |
| 152 elif idButton.isChecked(): | 151 elif idButton.isChecked(): |
| 153 return "id({0})".format(idEdit.text()) | 152 return "id({0})".format(idEdit.text()) |
| 154 elif tagButton.isChecked(): | 153 elif tagButton.isChecked(): |
| 159 return bookmarkCombo.currentText() | 158 return bookmarkCombo.currentText() |
| 160 elif expressionButton.isChecked(): | 159 elif expressionButton.isChecked(): |
| 161 return expressionEdit.text() | 160 return expressionEdit.text() |
| 162 elif tipButton and tipButton.isChecked(): | 161 elif tipButton and tipButton.isChecked(): |
| 163 return "" | 162 return "" |
| 164 | 163 |
| 165 return "" | 164 return "" |
| 166 | 165 |
| 167 def getData(self): | 166 def getData(self): |
| 168 """ | 167 """ |
| 169 Public method to retrieve the data for the rebase session. | 168 Public method to retrieve the data for the rebase session. |
| 170 | 169 |
| 171 @return tuple with a source indicator of "S" or "B", the source | 170 @return tuple with a source indicator of "S" or "B", the source |
| 172 revision, the destination revision, a flag indicating to collapse, | 171 revision, the destination revision, a flag indicating to collapse, |
| 173 a flag indicating to keep the original changesets, a flag | 172 a flag indicating to keep the original changesets, a flag |
| 174 indicating to keep the original branch name, a flag indicating | 173 indicating to keep the original branch name, a flag indicating |
| 175 to detach the source, a flag indicating to perform a dry-run only | 174 to detach the source, a flag indicating to perform a dry-run only |
| 182 elif self.baseButton.isChecked(): | 181 elif self.baseButton.isChecked(): |
| 183 indicator = "B" | 182 indicator = "B" |
| 184 else: | 183 else: |
| 185 indicator = "" | 184 indicator = "" |
| 186 rev1 = self.__getRevision(1) if indicator else "" | 185 rev1 = self.__getRevision(1) if indicator else "" |
| 187 | 186 |
| 188 return ( | 187 return ( |
| 189 indicator, | 188 indicator, |
| 190 rev1, | 189 rev1, |
| 191 self.__getRevision(2), | 190 self.__getRevision(2), |
| 192 self.collapseCheckBox.isChecked(), | 191 self.collapseCheckBox.isChecked(), |
