Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
- branch
- 5_4_x
- changeset 3248
- 38d32752025c
- parent 3245
- 48311fa7c52c
- child 3252
- 8dfa2a7e936d
equal
deleted
inserted
replaced
| 3245:48311fa7c52c | 3248:38d32752025c |
|---|---|
| 177 out, err = self.__hgClient.runcommand(preargs) | 177 out, err = self.__hgClient.runcommand(preargs) |
| 178 else: | 178 else: |
| 179 err = "" | 179 err = "" |
| 180 if err: | 180 if err: |
| 181 self.__showError(err) | 181 self.__showError(err) |
| 182 else: | 182 elif os.path.exists(self.vcs.bundleFile): |
| 183 out, err = self.__hgClient.runcommand(args) | 183 out, err = self.__hgClient.runcommand(args) |
| 184 if err: | 184 if err: |
| 185 self.__showError(err) | 185 self.__showError(err) |
| 186 if out and self.isVisible(): | 186 if out and self.isVisible(): |
| 187 for line in out.splitlines(True): | 187 for line in out.splitlines(True): |
| 200 process.start('hg', args) | 200 process.start('hg', args) |
| 201 procStarted = process.waitForStarted(5000) | 201 procStarted = process.waitForStarted(5000) |
| 202 if procStarted: | 202 if procStarted: |
| 203 process.waitForFinished(30000) | 203 process.waitForFinished(30000) |
| 204 | 204 |
| 205 self.process.start('hg', args) | 205 if os.path.exists(self.vcs.bundleFile): |
| 206 procStarted = self.process.waitForStarted(5000) | 206 self.process.start('hg', args) |
| 207 if not procStarted: | 207 procStarted = self.process.waitForStarted(5000) |
| 208 self.inputGroup.setEnabled(False) | 208 if not procStarted: |
| 209 self.inputGroup.hide() | 209 self.inputGroup.setEnabled(False) |
| 210 E5MessageBox.critical( | 210 self.inputGroup.hide() |
| 211 self, | 211 E5MessageBox.critical( |
| 212 self.trUtf8('Process Generation Error'), | 212 self, |
| 213 self.trUtf8( | 213 self.trUtf8('Process Generation Error'), |
| 214 'The process {0} could not be started. ' | 214 self.trUtf8( |
| 215 'Ensure, that it is in the search path.' | 215 'The process {0} could not be started. ' |
| 216 ).format('hg')) | 216 'Ensure, that it is in the search path.' |
| 217 ).format('hg')) | |
| 218 else: | |
| 219 self.__finish() | |
| 217 | 220 |
| 218 def __getParents(self, rev): | 221 def __getParents(self, rev): |
| 219 """ | 222 """ |
| 220 Private method to get the parents of the currently viewed | 223 Private method to get the parents of the currently viewed |
| 221 file/directory. | 224 file/directory. |
