Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
- changeset 3330
- 955e15f0ecce
- parent 3302
- e92f0dd51979
- child 3484
- 645c12de6b0c
- child 3516
- 4992e89def32
equal
deleted
inserted
replaced
| 3329:1ee38e29ed4f | 3330:955e15f0ecce |
|---|---|
| 199 process.start('hg', args) | 199 process.start('hg', args) |
| 200 procStarted = process.waitForStarted(5000) | 200 procStarted = process.waitForStarted(5000) |
| 201 if procStarted: | 201 if procStarted: |
| 202 process.waitForFinished(30000) | 202 process.waitForFinished(30000) |
| 203 | 203 |
| 204 if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile) or \ | 204 if self.mode != "incoming" or \ |
| 205 (self.vcs.bundleFile and | |
| 206 os.path.exists(self.vcs.bundleFile)) or \ | |
| 205 self.bundle: | 207 self.bundle: |
| 206 self.process.start('hg', args) | 208 self.process.start('hg', args) |
| 207 procStarted = self.process.waitForStarted(5000) | 209 procStarted = self.process.waitForStarted(5000) |
| 208 if not procStarted: | 210 if not procStarted: |
| 209 self.inputGroup.setEnabled(False) | 211 self.inputGroup.setEnabled(False) |
