Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py
- changeset 1640
- 1699d46026cd
- parent 1532
- df0c2a045c72
- child 1746
- 6c74208f22a2
- child 1761
- 2c174ab55c4a
equal
deleted
inserted
replaced
| 1639:294476b9c714 | 1640:1699d46026cd |
|---|---|
| 241 lockinfo == " " and \ | 241 lockinfo == " " and \ |
| 242 uptodate == " " and \ | 242 uptodate == " " and \ |
| 243 self.currentChangelist == "": | 243 self.currentChangelist == "": |
| 244 return | 244 return |
| 245 | 245 |
| 246 if revision == "": | |
| 247 rev = "" | |
| 248 else: | |
| 249 rev = int(revision) | |
| 250 if change == "": | |
| 251 chg = "" | |
| 252 else: | |
| 253 chg = int(change) | |
| 246 statusText = self.status[status] | 254 statusText = self.status[status] |
| 247 itm = QTreeWidgetItem(self.statusList, [ | 255 |
| 248 self.currentChangelist, | 256 itm = QTreeWidgetItem(self.statusList) |
| 249 statusText, | 257 itm.setData(0, Qt.DisplayRole, "") |
| 250 self.propStatus[propStatus], | 258 itm.setData(1, Qt.DisplayRole, self.currentChangelist) |
| 251 self.locked[locked], | 259 itm.setData(2, Qt.DisplayRole, statusText) |
| 252 self.history[history], | 260 itm.setData(3, Qt.DisplayRole, self.propStatus[propStatus]) |
| 253 self.switched[switched], | 261 itm.setData(4, Qt.DisplayRole, self.locked[locked]) |
| 254 self.lockinfo[lockinfo], | 262 itm.setData(5, Qt.DisplayRole, self.history[history]) |
| 255 self.uptodate[uptodate], | 263 itm.setData(6, Qt.DisplayRole, self.switched[switched]) |
| 256 "{0:7}".format(str(revision)), | 264 itm.setData(7, Qt.DisplayRole, self.lockinfo[lockinfo]) |
| 257 "{0:7}".format(str(change)), | 265 itm.setData(8, Qt.DisplayRole, self.uptodate[uptodate]) |
| 258 author, | 266 itm.setData(9, Qt.DisplayRole, rev) |
| 259 path, | 267 itm.setData(10, Qt.DisplayRole, chg) |
| 260 ]) | 268 itm.setData(11, Qt.DisplayRole, author) |
| 269 itm.setData(12, Qt.DisplayRole, path) | |
| 261 | 270 |
| 262 itm.setTextAlignment(1, Qt.AlignLeft) | 271 itm.setTextAlignment(1, Qt.AlignLeft) |
| 263 itm.setTextAlignment(2, Qt.AlignHCenter) | 272 itm.setTextAlignment(2, Qt.AlignHCenter) |
| 264 itm.setTextAlignment(3, Qt.AlignHCenter) | 273 itm.setTextAlignment(3, Qt.AlignHCenter) |
| 265 itm.setTextAlignment(4, Qt.AlignHCenter) | 274 itm.setTextAlignment(4, Qt.AlignHCenter) |
| 475 self.__generateItem(flags[0], flags[1], flags[2], flags[3], | 484 self.__generateItem(flags[0], flags[1], flags[2], flags[3], |
| 476 flags[4], flags[5], flags[7], rev, | 485 flags[4], flags[5], flags[7], rev, |
| 477 change, author, path) | 486 change, author, path) |
| 478 elif self.rx_status2.exactMatch(s): | 487 elif self.rx_status2.exactMatch(s): |
| 479 flags = self.rx_status2.cap(1) | 488 flags = self.rx_status2.cap(1) |
| 480 path = self.rx_status2.cap(2).trimmed() | 489 path = self.rx_status2.cap(2).strip() |
| 481 | 490 |
| 482 self.__generateItem(flags[0], flags[1], flags[2], flags[3], | 491 self.__generateItem(flags[0], flags[1], flags[2], flags[3], |
| 483 flags[4], flags[5], flags[7], "", "", | 492 flags[4], flags[5], flags[7], "", "", |
| 484 "", path) | 493 "", path) |
| 485 elif self.rx_changelist.exactMatch(s): | 494 elif self.rx_changelist.exactMatch(s): |
