Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- branch
- 5_4_x
- changeset 3248
- 38d32752025c
- parent 3245
- 48311fa7c52c
- child 3252
- 8dfa2a7e936d
equal
deleted
inserted
replaced
| 3245:48311fa7c52c | 3248:38d32752025c |
|---|---|
| 704 out, err = self.__hgClient.runcommand(preargs) | 704 out, err = self.__hgClient.runcommand(preargs) |
| 705 else: | 705 else: |
| 706 err = "" | 706 err = "" |
| 707 if err: | 707 if err: |
| 708 self.__showError(err) | 708 self.__showError(err) |
| 709 else: | 709 elif os.path.exists(self.vcs.bundleFile): |
| 710 out, err = self.__hgClient.runcommand(args) | 710 out, err = self.__hgClient.runcommand(args) |
| 711 self.buf = out.splitlines(True) | 711 self.buf = out.splitlines(True) |
| 712 if err: | 712 if err: |
| 713 self.__showError(err) | 713 self.__showError(err) |
| 714 self.__processBuffer() | 714 self.__processBuffer() |
| 727 process.start('hg', args) | 727 process.start('hg', args) |
| 728 procStarted = process.waitForStarted(5000) | 728 procStarted = process.waitForStarted(5000) |
| 729 if procStarted: | 729 if procStarted: |
| 730 process.waitForFinished(30000) | 730 process.waitForFinished(30000) |
| 731 | 731 |
| 732 self.process.start('hg', args) | 732 if os.path.exists(self.vcs.bundleFile): |
| 733 procStarted = self.process.waitForStarted(5000) | 733 self.process.start('hg', args) |
| 734 if not procStarted: | 734 procStarted = self.process.waitForStarted(5000) |
| 735 self.inputGroup.setEnabled(False) | 735 if not procStarted: |
| 736 self.inputGroup.hide() | 736 self.inputGroup.setEnabled(False) |
| 737 E5MessageBox.critical( | 737 self.inputGroup.hide() |
| 738 self, | 738 E5MessageBox.critical( |
| 739 self.trUtf8('Process Generation Error'), | 739 self, |
| 740 self.trUtf8( | 740 self.trUtf8('Process Generation Error'), |
| 741 'The process {0} could not be started. ' | 741 self.trUtf8( |
| 742 'Ensure, that it is in the search path.' | 742 'The process {0} could not be started. ' |
| 743 ).format('hg')) | 743 'Ensure, that it is in the search path.' |
| 744 ).format('hg')) | |
| 745 else: | |
| 746 self.__finish() | |
| 744 | 747 |
| 745 def start(self, fn): | 748 def start(self, fn): |
| 746 """ | 749 """ |
| 747 Public slot to start the hg log command. | 750 Public slot to start the hg log command. |
| 748 | 751 |
