Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgDialog.py
Plugins/VcsPlugins/vcsMercurial/HgDialog.py
- branch
- Py2 comp.
- changeset 3058
- 0a02c433f52d
- parent 3057
- 10516539f238
- parent 3023
- 34ce20603bf7
- child 3060
- 5883ce99ee12
equal
deleted
inserted
replaced
| 3057:10516539f238 | 3058:0a02c433f52d |
|---|---|
| 147 self.proc.start('hg', args) | 147 self.proc.start('hg', args) |
| 148 procStarted = self.proc.waitForStarted(5000) | 148 procStarted = self.proc.waitForStarted(5000) |
| 149 if not procStarted: | 149 if not procStarted: |
| 150 self.buttonBox.setFocus() | 150 self.buttonBox.setFocus() |
| 151 self.inputGroup.setEnabled(False) | 151 self.inputGroup.setEnabled(False) |
| 152 E5MessageBox.critical(self, | 152 E5MessageBox.critical( |
| 153 self, | |
| 153 self.trUtf8('Process Generation Error'), | 154 self.trUtf8('Process Generation Error'), |
| 154 self.trUtf8( | 155 self.trUtf8( |
| 155 'The process {0} could not be started. ' | 156 'The process {0} could not be started. ' |
| 156 'Ensure, that it is in the search path.' | 157 'Ensure, that it is in the search path.' |
| 157 ).format('hg')) | 158 ).format('hg')) |
| 161 return procStarted | 162 return procStarted |
| 162 else: | 163 else: |
| 163 self.inputGroup.setEnabled(False) | 164 self.inputGroup.setEnabled(False) |
| 164 self.inputGroup.hide() | 165 self.inputGroup.hide() |
| 165 | 166 |
| 166 out, err = self.__hgClient.runcommand(args, | 167 out, err = self.__hgClient.runcommand( |
| 167 output=self.__showOutput, error=self.__showError) | 168 args, output=self.__showOutput, error=self.__showError) |
| 168 | 169 |
| 169 if err: | 170 if err: |
| 170 self.__showError(err) | 171 self.__showError(err) |
| 171 if out: | 172 if out: |
| 172 self.__showOutput(out) | 173 self.__showOutput(out) |
