Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- branch
- Py2 comp.
- changeset 2791
- a9577f248f04
- parent 2678
- 6e40469b845b
- parent 2771
- 281c9b30dd91
- child 2847
- 1843ef6e2656
equal
deleted
inserted
replaced
| 2790:6686a3326df8 | 2791:a9577f248f04 |
|---|---|
| 406 output, errMsg = self.__hgClient.runcommand(args) | 406 output, errMsg = self.__hgClient.runcommand(args) |
| 407 else: | 407 else: |
| 408 process = QProcess() | 408 process = QProcess() |
| 409 process.setWorkingDirectory(self.repodir) | 409 process.setWorkingDirectory(self.repodir) |
| 410 process.start('hg', args) | 410 process.start('hg', args) |
| 411 procStarted = process.waitForStarted() | 411 procStarted = process.waitForStarted(5000) |
| 412 if procStarted: | 412 if procStarted: |
| 413 finished = process.waitForFinished(30000) | 413 finished = process.waitForFinished(30000) |
| 414 if finished and process.exitCode() == 0: | 414 if finished and process.exitCode() == 0: |
| 415 output = \ | 415 output = \ |
| 416 str(process.readAllStandardOutput(), | 416 str(process.readAllStandardOutput(), |
| 448 output, errMsg = self.__hgClient.runcommand(args) | 448 output, errMsg = self.__hgClient.runcommand(args) |
| 449 else: | 449 else: |
| 450 process = QProcess() | 450 process = QProcess() |
| 451 process.setWorkingDirectory(self.repodir) | 451 process.setWorkingDirectory(self.repodir) |
| 452 process.start('hg', args) | 452 process.start('hg', args) |
| 453 procStarted = process.waitForStarted() | 453 procStarted = process.waitForStarted(5000) |
| 454 if procStarted: | 454 if procStarted: |
| 455 finished = process.waitForFinished(30000) | 455 finished = process.waitForFinished(30000) |
| 456 if finished and process.exitCode() == 0: | 456 if finished and process.exitCode() == 0: |
| 457 output = \ | 457 output = \ |
| 458 str(process.readAllStandardOutput(), | 458 str(process.readAllStandardOutput(), |
| 494 output, errMsg = self.__hgClient.runcommand(args) | 494 output, errMsg = self.__hgClient.runcommand(args) |
| 495 else: | 495 else: |
| 496 process = QProcess() | 496 process = QProcess() |
| 497 process.setWorkingDirectory(self.repodir) | 497 process.setWorkingDirectory(self.repodir) |
| 498 process.start('hg', args) | 498 process.start('hg', args) |
| 499 procStarted = process.waitForStarted() | 499 procStarted = process.waitForStarted(5000) |
| 500 if procStarted: | 500 if procStarted: |
| 501 finished = process.waitForFinished(30000) | 501 finished = process.waitForFinished(30000) |
| 502 if finished and process.exitCode() == 0: | 502 if finished and process.exitCode() == 0: |
| 503 output = \ | 503 output = \ |
| 504 str(process.readAllStandardOutput(), | 504 str(process.readAllStandardOutput(), |
| 698 | 698 |
| 699 self.inputGroup.setEnabled(True) | 699 self.inputGroup.setEnabled(True) |
| 700 self.inputGroup.show() | 700 self.inputGroup.show() |
| 701 | 701 |
| 702 self.process.start('hg', args) | 702 self.process.start('hg', args) |
| 703 procStarted = self.process.waitForStarted() | 703 procStarted = self.process.waitForStarted(5000) |
| 704 if not procStarted: | 704 if not procStarted: |
| 705 self.inputGroup.setEnabled(False) | 705 self.inputGroup.setEnabled(False) |
| 706 self.inputGroup.hide() | 706 self.inputGroup.hide() |
| 707 E5MessageBox.critical(self, | 707 E5MessageBox.critical(self, |
| 708 self.trUtf8('Process Generation Error'), | 708 self.trUtf8('Process Generation Error'), |
| 961 """ | 961 """ |
| 962 if self.diff is None: | 962 if self.diff is None: |
| 963 from .HgDiffDialog import HgDiffDialog | 963 from .HgDiffDialog import HgDiffDialog |
| 964 self.diff = HgDiffDialog(self.vcs) | 964 self.diff = HgDiffDialog(self.vcs) |
| 965 self.diff.show() | 965 self.diff.show() |
| 966 self.diff.raise_() | |
| 966 self.diff.start(self.filename, [rev1, rev2], self.bundle) | 967 self.diff.start(self.filename, [rev1, rev2], self.bundle) |
| 967 | 968 |
| 968 def on_buttonBox_clicked(self, button): | 969 def on_buttonBox_clicked(self, button): |
| 969 """ | 970 """ |
| 970 Private slot called by a button of the button box clicked. | 971 Private slot called by a button of the button box clicked. |
