Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgDialog.py
Plugins/VcsPlugins/vcsMercurial/HgDialog.py
- changeset 3302
- e92f0dd51979
- parent 3290
- dbb53746813f
- child 3310
- a2032ed66aec
equal
deleted
inserted
replaced
| 3300:734353e7d679 | 3302:e92f0dd51979 |
|---|---|
| 43 | 43 |
| 44 self.proc = None | 44 self.proc = None |
| 45 self.username = '' | 45 self.username = '' |
| 46 self.password = '' | 46 self.password = '' |
| 47 self.__hgClient = hg.getClient() | 47 self.__hgClient = hg.getClient() |
| 48 self.vcs = hg | |
| 48 | 49 |
| 49 self.outputGroup.setTitle(text) | 50 self.outputGroup.setTitle(text) |
| 50 | 51 |
| 51 self.show() | 52 self.show() |
| 52 QCoreApplication.processEvents() | 53 QCoreApplication.processEvents() |
| 196 It reads the output of the process, formats it and inserts it into | 197 It reads the output of the process, formats it and inserts it into |
| 197 the contents pane. | 198 the contents pane. |
| 198 """ | 199 """ |
| 199 if self.proc is not None: | 200 if self.proc is not None: |
| 200 s = str(self.proc.readAllStandardOutput(), | 201 s = str(self.proc.readAllStandardOutput(), |
| 201 Preferences.getSystem("IOEncoding"), | 202 self.vcs.getEncoding(), |
| 202 'replace') | 203 'replace') |
| 203 self.__showOutput(s) | 204 self.__showOutput(s) |
| 204 | 205 |
| 205 def __showOutput(self, out): | 206 def __showOutput(self, out): |
| 206 """ | 207 """ |
| 227 It reads the error output of the process and inserts it into the | 228 It reads the error output of the process and inserts it into the |
| 228 error pane. | 229 error pane. |
| 229 """ | 230 """ |
| 230 if self.proc is not None: | 231 if self.proc is not None: |
| 231 s = str(self.proc.readAllStandardError(), | 232 s = str(self.proc.readAllStandardError(), |
| 232 Preferences.getSystem("IOEncoding"), | 233 self.vcs.getEncoding(), |
| 233 'replace') | 234 'replace') |
| 234 self.__showError(s) | 235 self.__showError(s) |
| 235 | 236 |
| 236 def __showError(self, out): | 237 def __showError(self, out): |
| 237 """ | 238 """ |
