Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py
Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py
- changeset 3190
- a9a94491c4fd
- parent 3160
- 209a07d7e401
- child 3302
- e92f0dd51979
equal
deleted
inserted
replaced
| 3189:9a21c547de5f | 3190:a9a94491c4fd |
|---|---|
| 97 error = str(process.readAllStandardError(), | 97 error = str(process.readAllStandardError(), |
| 98 self.__ioEncoding, 'replace') | 98 self.__ioEncoding, 'replace') |
| 99 else: | 99 else: |
| 100 process.kill() | 100 process.kill() |
| 101 process.waitForFinished() | 101 process.waitForFinished() |
| 102 error = self.trUtf8("Could not start the Mercurial process.") | 102 error = self.tr("Could not start the Mercurial process.") |
| 103 | 103 |
| 104 if error: | 104 if error: |
| 105 return False, error | 105 return False, error |
| 106 | 106 |
| 107 states = {} | 107 states = {} |
| 152 if name not in states: | 152 if name not in states: |
| 153 self.statusList.append(" {0}".format(name)) | 153 self.statusList.append(" {0}".format(name)) |
| 154 self.reportedStates = states | 154 self.reportedStates = states |
| 155 | 155 |
| 156 return True, \ | 156 return True, \ |
| 157 self.trUtf8("Mercurial status checked successfully") | 157 self.tr("Mercurial status checked successfully") |
| 158 | 158 |
| 159 def _shutdown(self): | 159 def _shutdown(self): |
| 160 """ | 160 """ |
| 161 Protected method performing shutdown actions. | 161 Protected method performing shutdown actions. |
| 162 """ | 162 """ |
