Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py
Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py
- changeset 12
- 1d8dd9706f46
- parent 0
- de9c2efb9d02
- child 13
- 1af94a91f439
equal
deleted
inserted
replaced
| 11:b0996e4a289e | 12:1d8dd9706f46 |
|---|---|
| 69 procStarted = process.waitForStarted() | 69 procStarted = process.waitForStarted() |
| 70 if procStarted: | 70 if procStarted: |
| 71 finished = process.waitForFinished(300000) | 71 finished = process.waitForFinished(300000) |
| 72 if finished and process.exitCode() == 0: | 72 if finished and process.exitCode() == 0: |
| 73 output = \ | 73 output = \ |
| 74 unicode(process.readAllStandardOutput(), self.__ioEncoding, 'replace') | 74 str(process.readAllStandardOutput(), self.__ioEncoding, 'replace') |
| 75 states = {} | 75 states = {} |
| 76 for line in output.splitlines(): | 76 for line in output.splitlines(): |
| 77 if self.rx_status1.exactMatch(line): | 77 if self.rx_status1.exactMatch(line): |
| 78 flags = str(self.rx_status1.cap(1)) | 78 flags = str(self.rx_status1.cap(1)) |
| 79 path = self.rx_status1.cap(3).strip() | 79 path = self.rx_status1.cap(3).strip() |
| 97 try: | 97 try: |
| 98 if self.reportedStates[name] != status: | 98 if self.reportedStates[name] != status: |
| 99 self.statusList.append("%s %s" % (status, name)) | 99 self.statusList.append("%s %s" % (status, name)) |
| 100 except KeyError: | 100 except KeyError: |
| 101 self.statusList.append("%s %s" % (status, name)) | 101 self.statusList.append("%s %s" % (status, name)) |
| 102 for name in self.reportedStates.keys(): | 102 for name in list(self.reportedStates.keys()): |
| 103 if name not in states: | 103 if name not in states: |
| 104 self.statusList.append(" %s" % name) | 104 self.statusList.append(" %s" % name) |
| 105 self.reportedStates = states | 105 self.reportedStates = states |
| 106 return True, \ | 106 return True, \ |
| 107 self.trUtf8("Subversion status checked successfully (using svn)") | 107 self.trUtf8("Subversion status checked successfully (using svn)") |
| 108 else: | 108 else: |
| 109 process.kill() | 109 process.kill() |
| 110 process.waitForFinished() | 110 process.waitForFinished() |
| 111 return False, unicode(process.readAllStandardError()) | 111 return False, |
| 112 str(process.readAllStandardError(), | |
| 113 Preferences.getSystem("IOEncoding"), | |
| 114 'replace') | |
| 112 else: | 115 else: |
| 113 process.kill() | 116 process.kill() |
| 114 process.waitForFinished() | 117 process.waitForFinished() |
| 115 return False, self.trUtf8("Could not start the Subversion process.") | 118 return False, self.trUtf8("Could not start the Subversion process.") |
