Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py
Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py
- branch
- Py2 comp.
- changeset 3484
- 645c12de6b0c
- parent 3178
- f25fc1364c88
- parent 3337
- 49faa820151a
- child 3656
- 441956d8fce5
equal
deleted
inserted
replaced
| 3456:96232974dcdb | 3484:645c12de6b0c |
|---|---|
| 151 @return tuple naming the revision, a flag indicating a | 151 @return tuple naming the revision, a flag indicating a |
| 152 merge, the commit date, the commit user and a commit message | 152 merge, the commit date, the commit user and a commit message |
| 153 (string, boolean, string, string, string) | 153 (string, boolean, string, string, string) |
| 154 """ | 154 """ |
| 155 if self.numberButton.isChecked(): | 155 if self.numberButton.isChecked(): |
| 156 rev = str(self.numberSpinBox.value()) | 156 rev = "rev({0})".format(self.numberSpinBox.value()) |
| 157 elif self.idButton.isChecked(): | 157 elif self.idButton.isChecked(): |
| 158 rev = self.idEdit.text() | 158 rev = "id({0})".format(self.idEdit.text()) |
| 159 elif self.tagButton.isChecked(): | 159 elif self.tagButton.isChecked(): |
| 160 rev = self.tagCombo.currentText() | 160 rev = self.tagCombo.currentText() |
| 161 elif self.branchButton.isChecked(): | 161 elif self.branchButton.isChecked(): |
| 162 rev = self.branchCombo.currentText() | 162 rev = self.branchCombo.currentText() |
| 163 elif self.bookmarkButton.isChecked(): | 163 elif self.bookmarkButton.isChecked(): |
| 171 date = "" | 171 date = "" |
| 172 | 172 |
| 173 if self.messageEdit.toPlainText(): | 173 if self.messageEdit.toPlainText(): |
| 174 msg = self.messageEdit.toPlainText() | 174 msg = self.messageEdit.toPlainText() |
| 175 else: | 175 else: |
| 176 msg = self.trUtf8("Backed out changeset <{0}>.").format(rev) | 176 msg = self.tr("Backed out changeset <{0}>.").format(rev) |
| 177 | 177 |
| 178 return (rev, | 178 return (rev, |
| 179 self.mergeCheckBox.isChecked, | 179 self.mergeCheckBox.isChecked, |
| 180 date, | 180 date, |
| 181 self.userEdit.text(), | 181 self.userEdit.text(), |
