Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
- changeset 3268
- 8bfa66a9138a
- parent 3265
- 972d6be9dde7
- child 3284
- 8f7d97997243
equal
deleted
inserted
replaced
| 3265:972d6be9dde7 | 3268:8bfa66a9138a |
|---|---|
| 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 (self.vcs.bundleFile and | 183 (self.vcs.bundleFile and |
| 184 os.path.exists(self.vcs.bundleFile)): | 184 os.path.exists(self.vcs.bundleFile)) or \ |
| 185 self.bundle: | |
| 185 out, err = self.__hgClient.runcommand(args) | 186 out, err = self.__hgClient.runcommand(args) |
| 186 if err: | 187 if err: |
| 187 self.__showError(err) | 188 self.__showError(err) |
| 188 if out and self.isVisible(): | 189 if out and self.isVisible(): |
| 189 for line in out.splitlines(True): | 190 for line in out.splitlines(True): |
| 202 process.start('hg', args) | 203 process.start('hg', args) |
| 203 procStarted = process.waitForStarted(5000) | 204 procStarted = process.waitForStarted(5000) |
| 204 if procStarted: | 205 if procStarted: |
| 205 process.waitForFinished(30000) | 206 process.waitForFinished(30000) |
| 206 | 207 |
| 207 if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile): | 208 if self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile) or \ |
| 209 self.bundle: | |
| 208 self.process.start('hg', args) | 210 self.process.start('hg', args) |
| 209 procStarted = self.process.waitForStarted(5000) | 211 procStarted = self.process.waitForStarted(5000) |
| 210 if not procStarted: | 212 if not procStarted: |
| 211 self.inputGroup.setEnabled(False) | 213 self.inputGroup.setEnabled(False) |
| 212 self.inputGroup.hide() | 214 self.inputGroup.hide() |
