Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
- branch
- 5_4_x
- changeset 3331
- 3a723d9cfa6a
- parent 3285
- 9e5b6fc3e74f
- child 3517
- e8a685fd7351
equal
deleted
inserted
replaced
| 3324:48cbf836d238 | 3331:3a723d9cfa6a |
|---|---|
| 203 process.start('hg', args) | 203 process.start('hg', args) |
| 204 procStarted = process.waitForStarted(5000) | 204 procStarted = process.waitForStarted(5000) |
| 205 if procStarted: | 205 if procStarted: |
| 206 process.waitForFinished(30000) | 206 process.waitForFinished(30000) |
| 207 | 207 |
| 208 if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile) or \ | 208 if self.mode != "incoming" or \ |
| 209 (self.vcs.bundleFile and | |
| 210 os.path.exists(self.vcs.bundleFile)) or \ | |
| 209 self.bundle: | 211 self.bundle: |
| 210 self.process.start('hg', args) | 212 self.process.start('hg', args) |
| 211 procStarted = self.process.waitForStarted(5000) | 213 procStarted = self.process.waitForStarted(5000) |
| 212 if not procStarted: | 214 if not procStarted: |
| 213 self.inputGroup.setEnabled(False) | 215 self.inputGroup.setEnabled(False) |
