Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.py
eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.py
- branch
- maintenance
- changeset 8273
- 698ae46f40a4
- parent 8259
- 2bbec88047dd
equal
deleted
inserted
replaced
| 8190:fb0ef164f536 | 8273:698ae46f40a4 |
|---|---|
| 24 @param version Mercurial version | 24 @param version Mercurial version |
| 25 @type tuple of three int | 25 @type tuple of three int |
| 26 @param parent reference to the parent widget | 26 @param parent reference to the parent widget |
| 27 @type QWidget | 27 @type QWidget |
| 28 """ | 28 """ |
| 29 super(HgShelveDataDialog, self).__init__(parent) | 29 super().__init__(parent) |
| 30 self.setupUi(self) | 30 self.setupUi(self) |
| 31 | 31 |
| 32 self.__initialDateTime = QDateTime.currentDateTime() | 32 self.__initialDateTime = QDateTime.currentDateTime() |
| 33 self.dateTimeEdit.setDateTime(self.__initialDateTime) | 33 self.dateTimeEdit.setDateTime(self.__initialDateTime) |
| 34 | 34 |
| 46 @return tuple containing the name, date, message, a flag indicating | 46 @return tuple containing the name, date, message, a flag indicating |
| 47 to add/remove new/missing files and a flag indicating to keep the | 47 to add/remove new/missing files and a flag indicating to keep the |
| 48 shelved changes in the working directory | 48 shelved changes in the working directory |
| 49 @rtype tuple of (str, QDateTime, str, bool, bool) | 49 @rtype tuple of (str, QDateTime, str, bool, bool) |
| 50 """ | 50 """ |
| 51 if self.dateTimeEdit.dateTime() != self.__initialDateTime: | 51 dateTime = ( |
| 52 dateTime = self.dateTimeEdit.dateTime() | 52 self.dateTimeEdit.dateTime() |
| 53 else: | 53 if self.dateTimeEdit.dateTime() != self.__initialDateTime else |
| 54 dateTime = QDateTime() | 54 QDateTime() |
| 55 ) | |
| 55 return ( | 56 return ( |
| 56 self.nameEdit.text().replace(" ", "_"), | 57 self.nameEdit.text().replace(" ", "_"), |
| 57 dateTime, | 58 dateTime, |
| 58 self.messageEdit.text(), | 59 self.messageEdit.text(), |
| 59 self.addRemoveCheckBox.isChecked(), | 60 self.addRemoveCheckBox.isChecked(), |
