Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py
Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py
- branch
- Py2 comp.
- changeset 3060
- 5883ce99ee12
- parent 3057
- 10516539f238
- parent 3044
- a6cee59c80a4
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3058:0a02c433f52d | 3060:5883ce99ee12 |
|---|---|
| 38 self.__ioEncoding = Preferences.getSystem("IOEncoding") | 38 self.__ioEncoding = Preferences.getSystem("IOEncoding") |
| 39 | 39 |
| 40 self.rx_status1 = \ | 40 self.rx_status1 = \ |
| 41 QRegExp('(.{8,9})\\s+([0-9-]+)\\s+(.+)\\s*') | 41 QRegExp('(.{8,9})\\s+([0-9-]+)\\s+(.+)\\s*') |
| 42 self.rx_status2 = QRegExp( | 42 self.rx_status2 = QRegExp( |
| 43 '(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*') | 43 '(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+(\\S+)\\s+(.+)\\s*') |
| 44 | 44 |
| 45 def _performMonitor(self): | 45 def _performMonitor(self): |
| 46 """ | 46 """ |
| 47 Protected method implementing the monitoring action. | 47 Protected method implementing the monitoring action. |
| 48 | 48 |
| 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, \ |
| 124 str(process.readAllStandardError(), | 124 str(process.readAllStandardError(), |
| 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.trUtf8( |
| 131 "Could not start the Subversion process.") | 131 "Could not start the Subversion process.") |
