Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py
- branch
- 5_2_x
- changeset 1774
- fda2bb18c3ae
- parent 1761
- 2c174ab55c4a
- child 2303
- 0ed4ed026c16
equal
deleted
inserted
replaced
| 1769:02e7e55b47f5 | 1774:fda2bb18c3ae |
|---|---|
| 187 ' ': self.trUtf8('yes'), | 187 ' ': self.trUtf8('yes'), |
| 188 '*': self.trUtf8('no'), | 188 '*': self.trUtf8('no'), |
| 189 } | 189 } |
| 190 | 190 |
| 191 self.rx_status = \ | 191 self.rx_status = \ |
| 192 QRegExp('(.{8})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*') | 192 QRegExp('(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*') |
| 193 # flags (8 anything), revision, changed rev, author, path | 193 # flags (8 or 9 anything), revision, changed rev, author, path |
| 194 self.rx_status2 = \ | 194 self.rx_status2 = \ |
| 195 QRegExp('(.{8})\\s+(.+)\\s*') | 195 QRegExp('(.{8,9})\\s+(.+)\\s*') |
| 196 # flags (8 anything), path | 196 # flags (8 or 9 anything), path |
| 197 self.rx_changelist = \ | 197 self.rx_changelist = \ |
| 198 QRegExp('--- \\S+ .([\\w\\s]+).:\\s+') | 198 QRegExp('--- \\S+ .([\\w\\s]+).:\\s+') |
| 199 # three dashes, Changelist (translated), quote, | 199 # three dashes, Changelist (translated), quote, |
| 200 # changelist name, quote, : | 200 # changelist name, quote, : |
| 201 | 201 |
| 486 change = self.rx_status.cap(3) | 486 change = self.rx_status.cap(3) |
| 487 author = self.rx_status.cap(4) | 487 author = self.rx_status.cap(4) |
| 488 path = self.rx_status.cap(5).strip() | 488 path = self.rx_status.cap(5).strip() |
| 489 | 489 |
| 490 self.__generateItem(flags[0], flags[1], flags[2], flags[3], | 490 self.__generateItem(flags[0], flags[1], flags[2], flags[3], |
| 491 flags[4], flags[5], flags[7], rev, | 491 flags[4], flags[5], flags[-1], rev, |
| 492 change, author, path) | 492 change, author, path) |
| 493 elif self.rx_status2.exactMatch(s): | 493 elif self.rx_status2.exactMatch(s): |
| 494 flags = self.rx_status2.cap(1) | 494 flags = self.rx_status2.cap(1) |
| 495 path = self.rx_status2.cap(2).strip() | 495 path = self.rx_status2.cap(2).strip() |
| 496 | 496 |
| 497 self.__generateItem(flags[0], flags[1], flags[2], flags[3], | 497 self.__generateItem(flags[0], flags[1], flags[2], flags[3], |
| 498 flags[4], flags[5], flags[7], "", "", | 498 flags[4], flags[5], flags[-1], "", "", |
| 499 "", path) | 499 "", path) |
| 500 elif self.rx_changelist.exactMatch(s): | 500 elif self.rx_changelist.exactMatch(s): |
| 501 self.currentChangelist = self.rx_changelist.cap(1) | 501 self.currentChangelist = self.rx_changelist.cap(1) |
| 502 self.changelistFound = True | 502 self.changelistFound = True |
| 503 | 503 |
