Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py
eric6/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py
- branch
- Commit_Merge_addition
- changeset 7152
- a99df2004bb7
- parent 6942
- 2602857055c5
- child 7229
- 53054eb5b15a
equal
deleted
inserted
replaced
| 7150:cfe71cde2eec | 7152:a99df2004bb7 |
|---|---|
| 23 @signal rejected() emitted, if the dialog was rejected | 23 @signal rejected() emitted, if the dialog was rejected |
| 24 """ | 24 """ |
| 25 accepted = pyqtSignal() | 25 accepted = pyqtSignal() |
| 26 rejected = pyqtSignal() | 26 rejected = pyqtSignal() |
| 27 | 27 |
| 28 def __init__(self, vcs, msg, mq, parent=None): | 28 def __init__(self, vcs, msg, mq, merge, parent=None): |
| 29 """ | 29 """ |
| 30 Constructor | 30 Constructor |
| 31 | 31 |
| 32 @param vcs reference to the vcs object | 32 @param vcs reference to the vcs object |
| 33 @param msg initial message (string) | 33 @param msg initial message (string) |
| 34 @param mq flag indicating a queue commit (boolean) | 34 @param mq flag indicating a queue commit (boolean) |
| 35 @param merge flag indicating a merge commit (boolean) | |
| 35 @param parent parent widget (QWidget) | 36 @param parent parent widget (QWidget) |
| 36 """ | 37 """ |
| 37 super(HgCommitDialog, self).__init__(parent, Qt.WindowFlags(Qt.Window)) | 38 super(HgCommitDialog, self).__init__(parent, Qt.WindowFlags(Qt.Window)) |
| 38 self.setupUi(self) | 39 self.setupUi(self) |
| 39 | 40 |
| 40 self.__vcs = vcs | 41 self.__vcs = vcs |
| 41 | 42 |
| 42 self.logEdit.setPlainText(msg) | 43 self.logEdit.setPlainText(msg) |
| 43 | 44 |
| 44 if mq: | 45 if mq or merge: |
| 45 self.amendCheckBox.setVisible(False) | 46 self.amendCheckBox.setVisible(False) |
| 46 self.subrepoCheckBox.setVisible(False) | 47 self.subrepoCheckBox.setVisible(False) |
| 47 else: | 48 else: |
| 48 self.subrepoCheckBox.setVisible(vcs.hasSubrepositories()) | 49 self.subrepoCheckBox.setVisible(vcs.hasSubrepositories()) |
| 49 | 50 |
