Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- changeset 3247
- ed79e48ba0b4
- parent 3243
- bbaa32bb9e63
- child 3249
- 8f22bfa586b1
equal
deleted
inserted
replaced
| 3246:4cd58a0d6c28 | 3247:ed79e48ba0b4 |
|---|---|
| 723 out, err = self.__hgClient.runcommand(preargs) | 723 out, err = self.__hgClient.runcommand(preargs) |
| 724 else: | 724 else: |
| 725 err = "" | 725 err = "" |
| 726 if err: | 726 if err: |
| 727 self.__showError(err) | 727 self.__showError(err) |
| 728 else: | 728 elif os.path.exists(self.vcs.bundleFile): |
| 729 out, err = self.__hgClient.runcommand(args) | 729 out, err = self.__hgClient.runcommand(args) |
| 730 self.buf = out.splitlines(True) | 730 self.buf = out.splitlines(True) |
| 731 if err: | 731 if err: |
| 732 self.__showError(err) | 732 self.__showError(err) |
| 733 self.__processBuffer() | 733 self.__processBuffer() |
| 746 process.start('hg', args) | 746 process.start('hg', args) |
| 747 procStarted = process.waitForStarted(5000) | 747 procStarted = process.waitForStarted(5000) |
| 748 if procStarted: | 748 if procStarted: |
| 749 process.waitForFinished(30000) | 749 process.waitForFinished(30000) |
| 750 | 750 |
| 751 self.process.start('hg', args) | 751 if os.path.exists(self.vcs.bundleFile): |
| 752 procStarted = self.process.waitForStarted(5000) | 752 self.process.start('hg', args) |
| 753 if not procStarted: | 753 procStarted = self.process.waitForStarted(5000) |
| 754 self.inputGroup.setEnabled(False) | 754 if not procStarted: |
| 755 self.inputGroup.hide() | 755 self.inputGroup.setEnabled(False) |
| 756 E5MessageBox.critical( | 756 self.inputGroup.hide() |
| 757 self, | 757 E5MessageBox.critical( |
| 758 self.tr('Process Generation Error'), | 758 self, |
| 759 self.tr( | 759 self.tr('Process Generation Error'), |
| 760 'The process {0} could not be started. ' | 760 self.tr( |
| 761 'Ensure, that it is in the search path.' | 761 'The process {0} could not be started. ' |
| 762 ).format('hg')) | 762 'Ensure, that it is in the search path.' |
| 763 ).format('hg')) | |
| 764 else: | |
| 765 self.__finish() | |
| 763 | 766 |
| 764 def start(self, fn): | 767 def start(self, fn): |
| 765 """ | 768 """ |
| 766 Public slot to start the hg log command. | 769 Public slot to start the hg log command. |
| 767 | 770 |
