133 'Ensure, that it is in the search path.' |
135 'Ensure, that it is in the search path.' |
134 ).format('svn')) |
136 ).format('svn')) |
135 |
137 |
136 def __finish(self): |
138 def __finish(self): |
137 """ |
139 """ |
138 Private slot called when the process finished or the user pressed the button. |
140 Private slot called when the process finished or the user pressed the |
|
141 button. |
139 """ |
142 """ |
140 if self.process is not None and \ |
143 if self.process is not None and \ |
141 self.process.state() != QProcess.NotRunning: |
144 self.process.state() != QProcess.NotRunning: |
142 self.process.terminate() |
145 self.process.terminate() |
143 QTimer.singleShot(2000, self.process.kill) |
146 QTimer.singleShot(2000, self.process.kill) |
190 s = str(self.process.readLine(), |
193 s = str(self.process.readLine(), |
191 Preferences.getSystem("IOEncoding"), |
194 Preferences.getSystem("IOEncoding"), |
192 'replace') |
195 'replace') |
193 if self.rx_path.exactMatch(s): |
196 if self.rx_path.exactMatch(s): |
194 if self.lastProp: |
197 if self.lastProp: |
195 self.__generateItem(self.lastPath, self.lastProp, self.propBuffer) |
198 self.__generateItem( |
|
199 self.lastPath, self.lastProp, self.propBuffer) |
196 self.lastPath = self.rx_path.cap(1) |
200 self.lastPath = self.rx_path.cap(1) |
197 self.lastProp = None |
201 self.lastProp = None |
198 self.propBuffer = "" |
202 self.propBuffer = "" |
199 elif self.rx_prop.exactMatch(s): |
203 elif self.rx_prop.exactMatch(s): |
200 if self.lastProp: |
204 if self.lastProp: |
201 self.__generateItem(self.lastPath, self.lastProp, self.propBuffer) |
205 self.__generateItem( |
|
206 self.lastPath, self.lastProp, self.propBuffer) |
202 self.lastProp = self.rx_prop.cap(1) |
207 self.lastProp = self.rx_prop.cap(1) |
203 self.propBuffer = self.rx_prop.cap(2) |
208 self.propBuffer = self.rx_prop.cap(2) |
204 else: |
209 else: |
205 self.propBuffer += ' ' |
210 self.propBuffer += ' ' |
206 self.propBuffer += s |
211 self.propBuffer += s |