Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
- branch
- 5_4_x
- changeset 3266
- d792451dd0fc
- parent 3252
- 8dfa2a7e936d
- child 3267
- 718e6ef2e74d
equal
deleted
inserted
replaced
| 3264:9b3c0a6e43e7 | 3266:d792451dd0fc |
|---|---|
| 178 else: | 178 else: |
| 179 err = "" | 179 err = "" |
| 180 if err: | 180 if err: |
| 181 self.__showError(err) | 181 self.__showError(err) |
| 182 elif self.mode != "incoming" or \ | 182 elif self.mode != "incoming" or \ |
| 183 os.path.exists(self.vcs.bundleFile): | 183 (self.vcs.bundleFile and |
| 184 os.path.exists(self.vcs.bundleFile)): | |
| 184 out, err = self.__hgClient.runcommand(args) | 185 out, err = self.__hgClient.runcommand(args) |
| 185 if err: | 186 if err: |
| 186 self.__showError(err) | 187 self.__showError(err) |
| 187 if out and self.isVisible(): | 188 if out and self.isVisible(): |
| 188 for line in out.splitlines(True): | 189 for line in out.splitlines(True): |
| 201 process.start('hg', args) | 202 process.start('hg', args) |
| 202 procStarted = process.waitForStarted(5000) | 203 procStarted = process.waitForStarted(5000) |
| 203 if procStarted: | 204 if procStarted: |
| 204 process.waitForFinished(30000) | 205 process.waitForFinished(30000) |
| 205 | 206 |
| 206 if os.path.exists(self.vcs.bundleFile): | 207 if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile): |
| 207 self.process.start('hg', args) | 208 self.process.start('hg', args) |
| 208 procStarted = self.process.waitForStarted(5000) | 209 procStarted = self.process.waitForStarted(5000) |
| 209 if not procStarted: | 210 if not procStarted: |
| 210 self.inputGroup.setEnabled(False) | 211 self.inputGroup.setEnabled(False) |
| 211 self.inputGroup.hide() | 212 self.inputGroup.hide() |
