Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- changeset 2771
- 281c9b30dd91
- parent 2731
- 5d1e721eb125
- child 2791
- a9577f248f04
- child 2838
- 0f1423054184
equal
deleted
inserted
replaced
| 2770:fd5ee85f0450 | 2771:281c9b30dd91 |
|---|---|
| 400 output, errMsg = self.__hgClient.runcommand(args) | 400 output, errMsg = self.__hgClient.runcommand(args) |
| 401 else: | 401 else: |
| 402 process = QProcess() | 402 process = QProcess() |
| 403 process.setWorkingDirectory(self.repodir) | 403 process.setWorkingDirectory(self.repodir) |
| 404 process.start('hg', args) | 404 process.start('hg', args) |
| 405 procStarted = process.waitForStarted() | 405 procStarted = process.waitForStarted(5000) |
| 406 if procStarted: | 406 if procStarted: |
| 407 finished = process.waitForFinished(30000) | 407 finished = process.waitForFinished(30000) |
| 408 if finished and process.exitCode() == 0: | 408 if finished and process.exitCode() == 0: |
| 409 output = \ | 409 output = \ |
| 410 str(process.readAllStandardOutput(), | 410 str(process.readAllStandardOutput(), |
| 442 output, errMsg = self.__hgClient.runcommand(args) | 442 output, errMsg = self.__hgClient.runcommand(args) |
| 443 else: | 443 else: |
| 444 process = QProcess() | 444 process = QProcess() |
| 445 process.setWorkingDirectory(self.repodir) | 445 process.setWorkingDirectory(self.repodir) |
| 446 process.start('hg', args) | 446 process.start('hg', args) |
| 447 procStarted = process.waitForStarted() | 447 procStarted = process.waitForStarted(5000) |
| 448 if procStarted: | 448 if procStarted: |
| 449 finished = process.waitForFinished(30000) | 449 finished = process.waitForFinished(30000) |
| 450 if finished and process.exitCode() == 0: | 450 if finished and process.exitCode() == 0: |
| 451 output = \ | 451 output = \ |
| 452 str(process.readAllStandardOutput(), | 452 str(process.readAllStandardOutput(), |
| 488 output, errMsg = self.__hgClient.runcommand(args) | 488 output, errMsg = self.__hgClient.runcommand(args) |
| 489 else: | 489 else: |
| 490 process = QProcess() | 490 process = QProcess() |
| 491 process.setWorkingDirectory(self.repodir) | 491 process.setWorkingDirectory(self.repodir) |
| 492 process.start('hg', args) | 492 process.start('hg', args) |
| 493 procStarted = process.waitForStarted() | 493 procStarted = process.waitForStarted(5000) |
| 494 if procStarted: | 494 if procStarted: |
| 495 finished = process.waitForFinished(30000) | 495 finished = process.waitForFinished(30000) |
| 496 if finished and process.exitCode() == 0: | 496 if finished and process.exitCode() == 0: |
| 497 output = \ | 497 output = \ |
| 498 str(process.readAllStandardOutput(), | 498 str(process.readAllStandardOutput(), |
| 692 | 692 |
| 693 self.inputGroup.setEnabled(True) | 693 self.inputGroup.setEnabled(True) |
| 694 self.inputGroup.show() | 694 self.inputGroup.show() |
| 695 | 695 |
| 696 self.process.start('hg', args) | 696 self.process.start('hg', args) |
| 697 procStarted = self.process.waitForStarted() | 697 procStarted = self.process.waitForStarted(5000) |
| 698 if not procStarted: | 698 if not procStarted: |
| 699 self.inputGroup.setEnabled(False) | 699 self.inputGroup.setEnabled(False) |
| 700 self.inputGroup.hide() | 700 self.inputGroup.hide() |
| 701 E5MessageBox.critical(self, | 701 E5MessageBox.critical(self, |
| 702 self.trUtf8('Process Generation Error'), | 702 self.trUtf8('Process Generation Error'), |
