Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgDialog.py
Plugins/VcsPlugins/vcsMercurial/HgDialog.py
- changeset 1242
- dfb9609caf51
- parent 1240
- 4d5fc346bd3b
- child 1245
- f2e75708f0c8
equal
deleted
inserted
replaced
| 1241:09c6155ee612 | 1242:dfb9609caf51 |
|---|---|
| 80 @param button button that was clicked (QAbstractButton) | 80 @param button button that was clicked (QAbstractButton) |
| 81 """ | 81 """ |
| 82 if button == self.buttonBox.button(QDialogButtonBox.Close): | 82 if button == self.buttonBox.button(QDialogButtonBox.Close): |
| 83 self.close() | 83 self.close() |
| 84 elif button == self.buttonBox.button(QDialogButtonBox.Cancel): | 84 elif button == self.buttonBox.button(QDialogButtonBox.Cancel): |
| 85 self.__finish() | 85 if self.__hgClient: |
| 86 self.__hgClient.cancel() | |
| 87 else: | |
| 88 self.__finish() | |
| 86 | 89 |
| 87 def __procFinished(self, exitCode, exitStatus): | 90 def __procFinished(self, exitCode, exitStatus): |
| 88 """ | 91 """ |
| 89 Private slot connected to the finished signal. | 92 Private slot connected to the finished signal. |
| 90 | 93 |
| 115 self.__updateCommand = True | 118 self.__updateCommand = True |
| 116 else: | 119 else: |
| 117 self.__updateCommand = False | 120 self.__updateCommand = False |
| 118 | 121 |
| 119 if showArgs: | 122 if showArgs: |
| 123 self.inputGroup.setEnabled(False) | |
| 124 self.inputGroup.hide() | |
| 125 | |
| 120 self.resultbox.append(' '.join(args)) | 126 self.resultbox.append(' '.join(args)) |
| 121 self.resultbox.append('') | 127 self.resultbox.append('') |
| 122 | 128 |
| 123 if self.__hgClient is None: | 129 if self.__hgClient is None: |
| 124 self.proc = QProcess() | 130 self.proc = QProcess() |
