Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- changeset 3268
- 8bfa66a9138a
- parent 3265
- 972d6be9dde7
- child 3273
- 075758282fdb
equal
deleted
inserted
replaced
| 3265:972d6be9dde7 | 3268:8bfa66a9138a |
|---|---|
| 725 err = "" | 725 err = "" |
| 726 if err: | 726 if err: |
| 727 self.__showError(err) | 727 self.__showError(err) |
| 728 elif self.commandMode != "incoming" or \ | 728 elif self.commandMode != "incoming" or \ |
| 729 (self.vcs.bundleFile and | 729 (self.vcs.bundleFile and |
| 730 os.path.exists(self.vcs.bundleFile)): | 730 os.path.exists(self.vcs.bundleFile)) or \ |
| 731 self.bundle: | |
| 731 out, err = self.__hgClient.runcommand(args) | 732 out, err = self.__hgClient.runcommand(args) |
| 732 self.buf = out.splitlines(True) | 733 self.buf = out.splitlines(True) |
| 733 if err: | 734 if err: |
| 734 self.__showError(err) | 735 self.__showError(err) |
| 735 self.__processBuffer() | 736 self.__processBuffer() |
| 748 process.start('hg', args) | 749 process.start('hg', args) |
| 749 procStarted = process.waitForStarted(5000) | 750 procStarted = process.waitForStarted(5000) |
| 750 if procStarted: | 751 if procStarted: |
| 751 process.waitForFinished(30000) | 752 process.waitForFinished(30000) |
| 752 | 753 |
| 753 if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile): | 754 if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile) or \ |
| 755 self.bundle: | |
| 754 self.process.start('hg', args) | 756 self.process.start('hg', args) |
| 755 procStarted = self.process.waitForStarted(5000) | 757 procStarted = self.process.waitForStarted(5000) |
| 756 if not procStarted: | 758 if not procStarted: |
| 757 self.inputGroup.setEnabled(False) | 759 self.inputGroup.setEnabled(False) |
| 758 self.inputGroup.hide() | 760 self.inputGroup.hide() |
