Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py
- changeset 6197
- ec4b978d3d88
- parent 6048
- 82ad8ec9548c
- child 6645
- ad476851d7e0
equal
deleted
inserted
replaced
| 6196:7135a692e43e | 6197:ec4b978d3d88 |
|---|---|
| 158 ] | 158 ] |
| 159 | 159 |
| 160 self.status = { | 160 self.status = { |
| 161 ' ': self.tr('normal'), | 161 ' ': self.tr('normal'), |
| 162 'A': self.tr('added'), | 162 'A': self.tr('added'), |
| 163 'C': self.tr('conflict'), | |
| 163 'D': self.tr('deleted'), | 164 'D': self.tr('deleted'), |
| 165 'I': self.tr('ignored'), | |
| 164 'M': self.tr('modified'), | 166 'M': self.tr('modified'), |
| 165 'R': self.tr('replaced'), | 167 'R': self.tr('replaced'), |
| 166 'C': self.tr('conflict'), | |
| 167 'X': self.tr('external'), | 168 'X': self.tr('external'), |
| 168 'I': self.tr('ignored'), | |
| 169 '?': self.tr('unversioned'), | 169 '?': self.tr('unversioned'), |
| 170 '!': self.tr('missing'), | 170 '!': self.tr('missing'), |
| 171 '~': self.tr('type error'), | 171 '~': self.tr('type error'), |
| 172 } | 172 } |
| 173 self.propStatus = { | 173 self.propStatus = { |
| 184 '+': self.tr('yes'), | 184 '+': self.tr('yes'), |
| 185 } | 185 } |
| 186 self.switched = { | 186 self.switched = { |
| 187 ' ': self.tr('no'), | 187 ' ': self.tr('no'), |
| 188 'S': self.tr('yes'), | 188 'S': self.tr('yes'), |
| 189 'X': self.tr('external') | |
| 189 } | 190 } |
| 190 self.lockinfo = { | 191 self.lockinfo = { |
| 191 ' ': self.tr('not locked'), | 192 ' ': self.tr('not locked'), |
| 192 'K': self.tr('locked'), | 193 'K': self.tr('locked'), |
| 193 'O': self.tr('other lock'), | 194 'O': self.tr('other lock'), |
| 509 change, author, path) | 510 change, author, path) |
| 510 elif self.rx_status2.exactMatch(s): | 511 elif self.rx_status2.exactMatch(s): |
| 511 flags = self.rx_status2.cap(1) | 512 flags = self.rx_status2.cap(1) |
| 512 path = self.rx_status2.cap(2).strip() | 513 path = self.rx_status2.cap(2).strip() |
| 513 | 514 |
| 514 self.__generateItem(flags[0], flags[1], flags[2], flags[3], | 515 if flags[-1] in self.uptodate: |
| 515 flags[4], flags[5], flags[-1], "", "", | 516 self.__generateItem(flags[0], flags[1], flags[2], |
| 516 "", path) | 517 flags[3], flags[4], flags[5], |
| 518 flags[-1], "", "", "", path) | |
| 517 elif self.rx_changelist.exactMatch(s): | 519 elif self.rx_changelist.exactMatch(s): |
| 518 self.currentChangelist = self.rx_changelist.cap(1) | 520 self.currentChangelist = self.rx_changelist.cap(1) |
| 519 self.changelistFound = True | 521 self.changelistFound = True |
| 520 | 522 |
| 521 def __readStderr(self): | 523 def __readStderr(self): |
