Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- changeset 3554
- 9ca56a89aec5
- parent 3546
- adce5fd2d051
- child 3562
- ef3f13a2c599
equal
deleted
inserted
replaced
| 3550:8019baa33b0c | 3554:9ca56a89aec5 |
|---|---|
| 50 | 50 |
| 51 LargefilesCacheL = ".hglf/" | 51 LargefilesCacheL = ".hglf/" |
| 52 LargefilesCacheW = ".hglf\\" | 52 LargefilesCacheW = ".hglf\\" |
| 53 PathSeparatorRe = re.compile(r"/|\\") | 53 PathSeparatorRe = re.compile(r"/|\\") |
| 54 | 54 |
| 55 ClosedIndicator = " \u2612" | |
| 56 | |
| 55 def __init__(self, vcs, mode="log", parent=None): | 57 def __init__(self, vcs, mode="log", parent=None): |
| 56 """ | 58 """ |
| 57 Constructor | 59 Constructor |
| 58 | 60 |
| 59 @param vcs reference to the vcs object | 61 @param vcs reference to the vcs object |
| 100 "<tr><td><b>Date</b></td><td>{1}</td></tr>" | 102 "<tr><td><b>Date</b></td><td>{1}</td></tr>" |
| 101 "<tr><td><b>Author</b></td><td>{2}</td></tr>" | 103 "<tr><td><b>Author</b></td><td>{2}</td></tr>" |
| 102 "<tr><td><b>Branch</b></td><td>{3}</td></tr>" | 104 "<tr><td><b>Branch</b></td><td>{3}</td></tr>" |
| 103 "<tr><td><b>Tags</b></td><td>{4}</td></tr>" | 105 "<tr><td><b>Tags</b></td><td>{4}</td></tr>" |
| 104 "<tr><td><b>Bookmarks</b></td><td>{5}</td></tr>" | 106 "<tr><td><b>Bookmarks</b></td><td>{5}</td></tr>" |
| 107 "<tr><td><b>Parents</b></td><td>{6}</td></tr>" | |
| 105 "</table>" | 108 "</table>" |
| 106 ) | 109 ) |
| 107 else: | 110 else: |
| 108 self.__detailsTemplate = self.tr( | 111 self.__detailsTemplate = self.tr( |
| 109 "<table>" | 112 "<table>" |
| 110 "<tr><td><b>Revision</b></td><td>{0}</td></tr>" | 113 "<tr><td><b>Revision</b></td><td>{0}</td></tr>" |
| 111 "<tr><td><b>Date</b></td><td>{1}</td></tr>" | 114 "<tr><td><b>Date</b></td><td>{1}</td></tr>" |
| 112 "<tr><td><b>Author</b></td><td>{2}</td></tr>" | 115 "<tr><td><b>Author</b></td><td>{2}</td></tr>" |
| 113 "<tr><td><b>Branch</b></td><td>{3}</td></tr>" | 116 "<tr><td><b>Branch</b></td><td>{3}</td></tr>" |
| 114 "<tr><td><b>Tags</b></td><td>{4}</td></tr>" | 117 "<tr><td><b>Tags</b></td><td>{4}</td></tr>" |
| 118 "<tr><td><b>Parents</b></td><td>{5}</td></tr>" | |
| 115 "</table>" | 119 "</table>" |
| 116 ) | 120 ) |
| 117 | 121 |
| 118 self.__bundle = "" | 122 self.__bundle = "" |
| 119 self.__filename = "" | 123 self.__filename = "" |
| 635 for line in message: | 639 for line in message: |
| 636 msg.append(line.strip()) | 640 msg.append(line.strip()) |
| 637 | 641 |
| 638 rev, node = revision.split(":") | 642 rev, node = revision.split(":") |
| 639 if rev in self.__closedBranchesRevs: | 643 if rev in self.__closedBranchesRevs: |
| 640 closedStr = " \u2612" | 644 closedStr = self.ClosedIndicator |
| 641 else: | 645 else: |
| 642 closedStr = "" | 646 closedStr = "" |
| 643 msgtxt = msg[0] | 647 msgtxt = msg[0] |
| 644 if len(msgtxt) > 30: | 648 if len(msgtxt) > 30: |
| 645 msgtxt = "{0}...".format(msgtxt[:30]) | 649 msgtxt = "{0}...".format(msgtxt[:30]) |
| 1230 if self.vcs.version >= (1, 8): | 1234 if self.vcs.version >= (1, 8): |
| 1231 self.detailsEdit.setHtml(self.__detailsTemplate.format( | 1235 self.detailsEdit.setHtml(self.__detailsTemplate.format( |
| 1232 itm.text(self.RevisionColumn), | 1236 itm.text(self.RevisionColumn), |
| 1233 itm.text(self.DateColumn), | 1237 itm.text(self.DateColumn), |
| 1234 itm.text(self.AuthorColumn), | 1238 itm.text(self.AuthorColumn), |
| 1235 itm.text(self.BranchColumn), | 1239 itm.text(self.BranchColumn).replace( |
| 1240 self.ClosedIndicator, ""), | |
| 1236 itm.text(self.TagsColumn), | 1241 itm.text(self.TagsColumn), |
| 1237 itm.text(self.BookmarksColumn) | 1242 itm.text(self.BookmarksColumn), |
| 1243 ", ".join( | |
| 1244 [str(x) for x in itm.data(0, self.__parentsRole)] | |
| 1245 ), | |
| 1238 )) | 1246 )) |
| 1239 else: | 1247 else: |
| 1240 self.detailsEdit.setHtml(self.__detailsTemplate.format( | 1248 self.detailsEdit.setHtml(self.__detailsTemplate.format( |
| 1241 itm.text(self.RevisionColumn), | 1249 itm.text(self.RevisionColumn), |
| 1242 itm.text(self.DateColumn), | 1250 itm.text(self.DateColumn), |
| 1243 itm.text(self.AuthorColumn), | 1251 itm.text(self.AuthorColumn), |
| 1244 itm.text(self.BranchColumn), | 1252 itm.text(self.BranchColumn).replace( |
| 1253 self.ClosedIndicator, ""), | |
| 1245 itm.text(self.TagsColumn), | 1254 itm.text(self.TagsColumn), |
| 1255 ", ".join( | |
| 1256 [str(x) for x in itm.data(0, self.__parentsRole)] | |
| 1257 ), | |
| 1246 )) | 1258 )) |
| 1247 | 1259 |
| 1248 for line in itm.data(0, self.__messageRole): | 1260 for line in itm.data(0, self.__messageRole): |
| 1249 self.messageEdit.append(line.strip()) | 1261 self.messageEdit.append(line.strip()) |
| 1250 | 1262 |
