Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- branch
- 5_4_x
- changeset 3331
- 3a723d9cfa6a
- parent 3286
- 91691f30f9f2
- child 3517
- e8a685fd7351
equal
deleted
inserted
replaced
| 3324:48cbf836d238 | 3331:3a723d9cfa6a |
|---|---|
| 731 process.start('hg', args) | 731 process.start('hg', args) |
| 732 procStarted = process.waitForStarted(5000) | 732 procStarted = process.waitForStarted(5000) |
| 733 if procStarted: | 733 if procStarted: |
| 734 process.waitForFinished(30000) | 734 process.waitForFinished(30000) |
| 735 | 735 |
| 736 if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile) or \ | 736 if self.commandMode != "incoming" or \ |
| 737 (self.vcs.bundleFile and | |
| 738 os.path.exists(self.vcs.bundleFile)) or \ | |
| 737 self.bundle: | 739 self.bundle: |
| 738 self.process.start('hg', args) | 740 self.process.start('hg', args) |
| 739 procStarted = self.process.waitForStarted(5000) | 741 procStarted = self.process.waitForStarted(5000) |
| 740 if not procStarted: | 742 if not procStarted: |
| 741 self.inputGroup.setEnabled(False) | 743 self.inputGroup.setEnabled(False) |
