Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- branch
- 5_4_x
- changeset 3267
- 718e6ef2e74d
- parent 3266
- d792451dd0fc
- child 3274
- f73cb16b37b4
equal
deleted
inserted
replaced
| 3266:d792451dd0fc | 3267:718e6ef2e74d |
|---|---|
| 706 err = "" | 706 err = "" |
| 707 if err: | 707 if err: |
| 708 self.__showError(err) | 708 self.__showError(err) |
| 709 elif self.commandMode != "incoming" or \ | 709 elif self.commandMode != "incoming" or \ |
| 710 (self.vcs.bundleFile and | 710 (self.vcs.bundleFile and |
| 711 os.path.exists(self.vcs.bundleFile)): | 711 os.path.exists(self.vcs.bundleFile)) or \ |
| 712 self.bundle: | |
| 712 out, err = self.__hgClient.runcommand(args) | 713 out, err = self.__hgClient.runcommand(args) |
| 713 self.buf = out.splitlines(True) | 714 self.buf = out.splitlines(True) |
| 714 if err: | 715 if err: |
| 715 self.__showError(err) | 716 self.__showError(err) |
| 716 self.__processBuffer() | 717 self.__processBuffer() |
| 729 process.start('hg', args) | 730 process.start('hg', args) |
| 730 procStarted = process.waitForStarted(5000) | 731 procStarted = process.waitForStarted(5000) |
| 731 if procStarted: | 732 if procStarted: |
| 732 process.waitForFinished(30000) | 733 process.waitForFinished(30000) |
| 733 | 734 |
| 734 if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile): | 735 if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile) or \ |
| 736 self.bundle: | |
| 735 self.process.start('hg', args) | 737 self.process.start('hg', args) |
| 736 procStarted = self.process.waitForStarted(5000) | 738 procStarted = self.process.waitForStarted(5000) |
| 737 if not procStarted: | 739 if not procStarted: |
| 738 self.inputGroup.setEnabled(False) | 740 self.inputGroup.setEnabled(False) |
| 739 self.inputGroup.hide() | 741 self.inputGroup.hide() |
