Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- changeset 3265
- 972d6be9dde7
- parent 3255
- 51152e85c5e9
- child 3268
- 8bfa66a9138a
equal
deleted
inserted
replaced
| 3261:b8fee972444b | 3265:972d6be9dde7 |
|---|---|
| 724 else: | 724 else: |
| 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 os.path.exists(self.vcs.bundleFile): | 729 (self.vcs.bundleFile and |
| 730 os.path.exists(self.vcs.bundleFile)): | |
| 730 out, err = self.__hgClient.runcommand(args) | 731 out, err = self.__hgClient.runcommand(args) |
| 731 self.buf = out.splitlines(True) | 732 self.buf = out.splitlines(True) |
| 732 if err: | 733 if err: |
| 733 self.__showError(err) | 734 self.__showError(err) |
| 734 self.__processBuffer() | 735 self.__processBuffer() |
| 747 process.start('hg', args) | 748 process.start('hg', args) |
| 748 procStarted = process.waitForStarted(5000) | 749 procStarted = process.waitForStarted(5000) |
| 749 if procStarted: | 750 if procStarted: |
| 750 process.waitForFinished(30000) | 751 process.waitForFinished(30000) |
| 751 | 752 |
| 752 if os.path.exists(self.vcs.bundleFile): | 753 if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile): |
| 753 self.process.start('hg', args) | 754 self.process.start('hg', args) |
| 754 procStarted = self.process.waitForStarted(5000) | 755 procStarted = self.process.waitForStarted(5000) |
| 755 if not procStarted: | 756 if not procStarted: |
| 756 self.inputGroup.setEnabled(False) | 757 self.inputGroup.setEnabled(False) |
| 757 self.inputGroup.hide() | 758 self.inputGroup.hide() |
