Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py
eric6/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py
- changeset 8259
- 2bbec88047dd
- parent 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8258:82b608e352ec | 8259:2bbec88047dd |
|---|---|
| 163 elif self.bookmarkButton.isChecked(): | 163 elif self.bookmarkButton.isChecked(): |
| 164 rev = self.bookmarkCombo.currentText() | 164 rev = self.bookmarkCombo.currentText() |
| 165 else: | 165 else: |
| 166 rev = "" | 166 rev = "" |
| 167 | 167 |
| 168 if self.dateEdit.dateTime() != self.__initDateTime: | 168 date = ( |
| 169 date = self.dateEdit.dateTime().toString("yyyy-MM-dd hh:mm") | 169 self.dateEdit.dateTime().toString("yyyy-MM-dd hh:mm") |
| 170 else: | 170 if self.dateEdit.dateTime() != self.__initDateTime else |
| 171 date = "" | 171 "" |
| 172 ) | |
| 172 | 173 |
| 173 if self.messageEdit.toPlainText(): | 174 msg = ( |
| 174 msg = self.messageEdit.toPlainText() | 175 self.messageEdit.toPlainText() |
| 175 else: | 176 if self.messageEdit.toPlainText() else |
| 176 msg = self.tr("Backed out changeset <{0}>.").format(rev) | 177 self.tr("Backed out changeset <{0}>.").format(rev) |
| 178 ) | |
| 177 | 179 |
| 178 return (rev, | 180 return (rev, |
| 179 self.mergeCheckBox.isChecked, | 181 self.mergeCheckBox.isChecked, |
| 180 date, | 182 date, |
| 181 self.userEdit.text(), | 183 self.userEdit.text(), |
