Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py
Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py
- branch
- Py2 comp.
- changeset 3484
- 645c12de6b0c
- parent 3178
- f25fc1364c88
- parent 3190
- a9a94491c4fd
- child 3656
- 441956d8fce5
equal
deleted
inserted
replaced
| 3456:96232974dcdb | 3484:645c12de6b0c |
|---|---|
| 7 Module implementing the VCS status monitor thread class for Subversion. | 7 Module implementing the VCS status monitor thread class for Subversion. |
| 8 """ | 8 """ |
| 9 | 9 |
| 10 from __future__ import unicode_literals | 10 from __future__ import unicode_literals |
| 11 try: | 11 try: |
| 12 str = unicode # __IGNORE_WARNING__ | 12 str = unicode |
| 13 except (NameError): | 13 except NameError: |
| 14 pass | 14 pass |
| 15 | 15 |
| 16 from PyQt4.QtCore import QRegExp, QProcess | 16 from PyQt4.QtCore import QRegExp, QProcess |
| 17 | 17 |
| 18 from VCS.StatusMonitorThread import VcsStatusMonitorThread | 18 from VCS.StatusMonitorThread import VcsStatusMonitorThread |
| 113 "{0} {1}".format(status, name)) | 113 "{0} {1}".format(status, name)) |
| 114 for name in list(self.reportedStates.keys()): | 114 for name in list(self.reportedStates.keys()): |
| 115 if name not in states: | 115 if name not in states: |
| 116 self.statusList.append(" {0}".format(name)) | 116 self.statusList.append(" {0}".format(name)) |
| 117 self.reportedStates = states | 117 self.reportedStates = states |
| 118 return True, self.trUtf8( | 118 return True, self.tr( |
| 119 "Subversion status checked successfully (using svn)") | 119 "Subversion status checked successfully (using svn)") |
| 120 else: | 120 else: |
| 121 process.kill() | 121 process.kill() |
| 122 process.waitForFinished() | 122 process.waitForFinished() |
| 123 return False, \ | 123 return False, \ |
| 125 Preferences.getSystem("IOEncoding"), | 125 Preferences.getSystem("IOEncoding"), |
| 126 'replace') | 126 'replace') |
| 127 else: | 127 else: |
| 128 process.kill() | 128 process.kill() |
| 129 process.waitForFinished() | 129 process.waitForFinished() |
| 130 return False, self.trUtf8( | 130 return False, self.tr( |
| 131 "Could not start the Subversion process.") | 131 "Could not start the Subversion process.") |
