Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py
Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py
- changeset 2771
- 281c9b30dd91
- parent 2405
- d4b5f3bd4720
- child 2791
- a9577f248f04
- child 3008
- 7848489bcb92
equal
deleted
inserted
replaced
| 2770:fd5ee85f0450 | 2771:281c9b30dd91 |
|---|---|
| 73 else: | 73 else: |
| 74 ioEncoding = Preferences.getSystem("IOEncoding") | 74 ioEncoding = Preferences.getSystem("IOEncoding") |
| 75 process = QProcess() | 75 process = QProcess() |
| 76 process.setWorkingDirectory(repodir) | 76 process.setWorkingDirectory(repodir) |
| 77 process.start('hg', args) | 77 process.start('hg', args) |
| 78 procStarted = process.waitForStarted() | 78 procStarted = process.waitForStarted(5000) |
| 79 if procStarted: | 79 if procStarted: |
| 80 finished = process.waitForFinished(30000) | 80 finished = process.waitForFinished(30000) |
| 81 if finished and process.exitCode() == 0: | 81 if finished and process.exitCode() == 0: |
| 82 output = \ | 82 output = \ |
| 83 str(process.readAllStandardOutput(), ioEncoding, 'replace') | 83 str(process.readAllStandardOutput(), ioEncoding, 'replace') |
| 269 else: | 269 else: |
| 270 ioEncoding = Preferences.getSystem("IOEncoding") | 270 ioEncoding = Preferences.getSystem("IOEncoding") |
| 271 process = QProcess() | 271 process = QProcess() |
| 272 process.setWorkingDirectory(repodir) | 272 process.setWorkingDirectory(repodir) |
| 273 process.start('hg', args) | 273 process.start('hg', args) |
| 274 procStarted = process.waitForStarted() | 274 procStarted = process.waitForStarted(5000) |
| 275 if procStarted: | 275 if procStarted: |
| 276 finished = process.waitForFinished(30000) | 276 finished = process.waitForFinished(30000) |
| 277 if finished and process.exitCode() == 0: | 277 if finished and process.exitCode() == 0: |
| 278 output = \ | 278 output = \ |
| 279 str(process.readAllStandardOutput(), ioEncoding, 'replace') | 279 str(process.readAllStandardOutput(), ioEncoding, 'replace') |
