Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py
- branch
- Py2 comp.
- changeset 3060
- 5883ce99ee12
- parent 3058
- 0a02c433f52d
- parent 3037
- a417a0670a36
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3058:0a02c433f52d | 3060:5883ce99ee12 |
|---|---|
| 330 log["revision"] = self.rx_rev2.cap(1) | 330 log["revision"] = self.rx_rev2.cap(1) |
| 331 log["author"] = self.rx_rev2.cap(2) | 331 log["author"] = self.rx_rev2.cap(2) |
| 332 log["date"] = self.rx_rev2.cap(3) | 332 log["date"] = self.rx_rev2.cap(3) |
| 333 # number of lines is ignored | 333 # number of lines is ignored |
| 334 elif self.rx_flags1.exactMatch(s): | 334 elif self.rx_flags1.exactMatch(s): |
| 335 changedPaths.append({\ | 335 changedPaths.append({ |
| 336 "action": | 336 "action": |
| 337 self.rx_flags1.cap(1).strip(), | 337 self.rx_flags1.cap(1).strip(), |
| 338 "path": | 338 "path": |
| 339 self.rx_flags1.cap(2).strip(), | 339 self.rx_flags1.cap(2).strip(), |
| 340 "copyfrom_path": | 340 "copyfrom_path": |
| 341 self.rx_flags1.cap(3).strip(), | 341 self.rx_flags1.cap(3).strip(), |
| 342 "copyfrom_revision": | 342 "copyfrom_revision": |
| 343 self.rx_flags1.cap(4).strip(), | 343 self.rx_flags1.cap(4).strip(), |
| 344 }) | 344 }) |
| 345 elif self.rx_flags2.exactMatch(s): | 345 elif self.rx_flags2.exactMatch(s): |
| 346 changedPaths.append({\ | 346 changedPaths.append({ |
| 347 "action": | 347 "action": |
| 348 self.rx_flags2.cap(1).strip(), | 348 self.rx_flags2.cap(1).strip(), |
| 349 "path": | 349 "path": |
| 350 self.rx_flags2.cap(2).strip(), | 350 self.rx_flags2.cap(2).strip(), |
| 351 "copyfrom_path": "", | 351 "copyfrom_path": "", |
| 352 "copyfrom_revision": "", | 352 "copyfrom_revision": "", |
| 353 }) | 353 }) |
| 354 elif self.rx_sep1.exactMatch(s) or self.rx_sep2.exactMatch(s): | 354 elif self.rx_sep1.exactMatch(s) or self.rx_sep2.exactMatch(s): |
| 355 if len(log) > 1: | 355 if len(log) > 1: |
| 404 """ | 404 """ |
| 405 self.process.setReadChannel(QProcess.StandardOutput) | 405 self.process.setReadChannel(QProcess.StandardOutput) |
| 406 | 406 |
| 407 while self.process.canReadLine(): | 407 while self.process.canReadLine(): |
| 408 line = str(self.process.readLine(), | 408 line = str(self.process.readLine(), |
| 409 Preferences.getSystem("IOEncoding"), | 409 Preferences.getSystem("IOEncoding"), |
| 410 'replace') | 410 'replace') |
| 411 self.buf.append(line) | 411 self.buf.append(line) |
| 412 | 412 |
| 413 def __readStderr(self): | 413 def __readStderr(self): |
| 414 """ | 414 """ |
| 415 Private slot to handle the readyReadStandardError signal. | 415 Private slot to handle the readyReadStandardError signal. |
| 418 error pane. | 418 error pane. |
| 419 """ | 419 """ |
| 420 if self.process is not None: | 420 if self.process is not None: |
| 421 self.errorGroup.show() | 421 self.errorGroup.show() |
| 422 s = str(self.process.readAllStandardError(), | 422 s = str(self.process.readAllStandardError(), |
| 423 Preferences.getSystem("IOEncoding"), | 423 Preferences.getSystem("IOEncoding"), |
| 424 'replace') | 424 'replace') |
| 425 self.errors.insertPlainText(s) | 425 self.errors.insertPlainText(s) |
| 426 self.errors.ensureCursorVisible() | 426 self.errors.ensureCursorVisible() |
| 427 | 427 |
| 428 def __diffRevisions(self, rev1, rev2): | 428 def __diffRevisions(self, rev1, rev2): |
| 429 """ | 429 """ |
