Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- changeset 3562
- ef3f13a2c599
- parent 3554
- 9ca56a89aec5
- child 3591
- 2f2a4a76dd22
equal
deleted
inserted
replaced
| 3559:8938a2a66dee | 3562:ef3f13a2c599 |
|---|---|
| 93 else: | 93 else: |
| 94 self.commandMode = "log" | 94 self.commandMode = "log" |
| 95 self.initialCommandMode = "log" | 95 self.initialCommandMode = "log" |
| 96 self.__hgClient = vcs.getClient() | 96 self.__hgClient = vcs.getClient() |
| 97 | 97 |
| 98 if self.vcs.version >= (1, 8): | 98 self.__detailsTemplate = self.tr( |
| 99 self.__detailsTemplate = self.tr( | 99 "<table>" |
| 100 "<table>" | 100 "<tr><td><b>Revision</b></td><td>{0}</td></tr>" |
| 101 "<tr><td><b>Revision</b></td><td>{0}</td></tr>" | 101 "<tr><td><b>Date</b></td><td>{1}</td></tr>" |
| 102 "<tr><td><b>Date</b></td><td>{1}</td></tr>" | 102 "<tr><td><b>Author</b></td><td>{2}</td></tr>" |
| 103 "<tr><td><b>Author</b></td><td>{2}</td></tr>" | 103 "<tr><td><b>Branch</b></td><td>{3}</td></tr>" |
| 104 "<tr><td><b>Branch</b></td><td>{3}</td></tr>" | 104 "<tr><td><b>Tags</b></td><td>{4}</td></tr>" |
| 105 "<tr><td><b>Tags</b></td><td>{4}</td></tr>" | 105 "<tr><td><b>Bookmarks</b></td><td>{5}</td></tr>" |
| 106 "<tr><td><b>Bookmarks</b></td><td>{5}</td></tr>" | 106 "<tr><td><b>Parents</b></td><td>{6}</td></tr>" |
| 107 "<tr><td><b>Parents</b></td><td>{6}</td></tr>" | 107 "</table>" |
| 108 "</table>" | 108 ) |
| 109 ) | |
| 110 else: | |
| 111 self.__detailsTemplate = self.tr( | |
| 112 "<table>" | |
| 113 "<tr><td><b>Revision</b></td><td>{0}</td></tr>" | |
| 114 "<tr><td><b>Date</b></td><td>{1}</td></tr>" | |
| 115 "<tr><td><b>Author</b></td><td>{2}</td></tr>" | |
| 116 "<tr><td><b>Branch</b></td><td>{3}</td></tr>" | |
| 117 "<tr><td><b>Tags</b></td><td>{4}</td></tr>" | |
| 118 "<tr><td><b>Parents</b></td><td>{5}</td></tr>" | |
| 119 "</table>" | |
| 120 ) | |
| 121 | 109 |
| 122 self.__bundle = "" | 110 self.__bundle = "" |
| 123 self.__filename = "" | 111 self.__filename = "" |
| 124 self.__isFile = False | 112 self.__isFile = False |
| 125 | 113 |
| 153 self.__dotRadius = 8 | 141 self.__dotRadius = 8 |
| 154 self.__rowHeight = 20 | 142 self.__rowHeight = 20 |
| 155 | 143 |
| 156 self.logTree.setIconSize( | 144 self.logTree.setIconSize( |
| 157 QSize(100 * self.__rowHeight, self.__rowHeight)) | 145 QSize(100 * self.__rowHeight, self.__rowHeight)) |
| 158 if self.vcs.version >= (1, 8): | 146 self.BookmarksColumn = self.logTree.columnCount() |
| 159 self.BookmarksColumn = self.logTree.columnCount() | 147 self.logTree.headerItem().setText( |
| 160 self.logTree.headerItem().setText( | 148 self.BookmarksColumn, self.tr("Bookmarks")) |
| 161 self.BookmarksColumn, self.tr("Bookmarks")) | |
| 162 else: | |
| 163 self.BookmarksColumn = -1 | |
| 164 if self.vcs.version < (2, 1): | 149 if self.vcs.version < (2, 1): |
| 165 self.logTree.setColumnHidden(self.PhaseColumn, True) | 150 self.logTree.setColumnHidden(self.PhaseColumn, True) |
| 166 | 151 |
| 167 self.__actionsMenu = QMenu() | 152 self.__actionsMenu = QMenu() |
| 168 if self.vcs.version >= (2, 0): | 153 if self.vcs.version >= (2, 0): |
| 757 args.append('--style') | 742 args.append('--style') |
| 758 if self.vcs.version >= (2, 1): | 743 if self.vcs.version >= (2, 1): |
| 759 args.append(os.path.join(os.path.dirname(__file__), | 744 args.append(os.path.join(os.path.dirname(__file__), |
| 760 "styles", | 745 "styles", |
| 761 "logBrowserBookmarkPhase.style")) | 746 "logBrowserBookmarkPhase.style")) |
| 762 elif self.vcs.version >= (1, 8): | 747 else: |
| 763 args.append(os.path.join(os.path.dirname(__file__), | 748 args.append(os.path.join(os.path.dirname(__file__), |
| 764 "styles", | 749 "styles", |
| 765 "logBrowserBookmark.style")) | 750 "logBrowserBookmark.style")) |
| 766 else: | |
| 767 args.append(os.path.join(os.path.dirname(__file__), | |
| 768 "styles", | |
| 769 "logBrowser.style")) | |
| 770 if self.commandMode == "incoming": | 751 if self.commandMode == "incoming": |
| 771 if self.__bundle: | 752 if self.__bundle: |
| 772 args.append(self.__bundle) | 753 args.append(self.__bundle) |
| 773 elif not self.vcs.hasSubrepositories(): | 754 elif not self.vcs.hasSubrepositories(): |
| 774 project = e5App().getObject("Project") | 755 project = e5App().getObject("Project") |
| 1229 self.detailsEdit.clear() | 1210 self.detailsEdit.clear() |
| 1230 self.messageEdit.clear() | 1211 self.messageEdit.clear() |
| 1231 self.filesTree.clear() | 1212 self.filesTree.clear() |
| 1232 | 1213 |
| 1233 if itm is not None: | 1214 if itm is not None: |
| 1234 if self.vcs.version >= (1, 8): | 1215 self.detailsEdit.setHtml(self.__detailsTemplate.format( |
| 1235 self.detailsEdit.setHtml(self.__detailsTemplate.format( | 1216 itm.text(self.RevisionColumn), |
| 1236 itm.text(self.RevisionColumn), | 1217 itm.text(self.DateColumn), |
| 1237 itm.text(self.DateColumn), | 1218 itm.text(self.AuthorColumn), |
| 1238 itm.text(self.AuthorColumn), | 1219 itm.text(self.BranchColumn).replace( |
| 1239 itm.text(self.BranchColumn).replace( | 1220 self.ClosedIndicator, ""), |
| 1240 self.ClosedIndicator, ""), | 1221 itm.text(self.TagsColumn), |
| 1241 itm.text(self.TagsColumn), | 1222 itm.text(self.BookmarksColumn), |
| 1242 itm.text(self.BookmarksColumn), | 1223 ", ".join( |
| 1243 ", ".join( | 1224 [str(x) for x in itm.data(0, self.__parentsRole)] |
| 1244 [str(x) for x in itm.data(0, self.__parentsRole)] | 1225 ), |
| 1245 ), | 1226 )) |
| 1246 )) | |
| 1247 else: | |
| 1248 self.detailsEdit.setHtml(self.__detailsTemplate.format( | |
| 1249 itm.text(self.RevisionColumn), | |
| 1250 itm.text(self.DateColumn), | |
| 1251 itm.text(self.AuthorColumn), | |
| 1252 itm.text(self.BranchColumn).replace( | |
| 1253 self.ClosedIndicator, ""), | |
| 1254 itm.text(self.TagsColumn), | |
| 1255 ", ".join( | |
| 1256 [str(x) for x in itm.data(0, self.__parentsRole)] | |
| 1257 ), | |
| 1258 )) | |
| 1259 | 1227 |
| 1260 for line in itm.data(0, self.__messageRole): | 1228 for line in itm.data(0, self.__messageRole): |
| 1261 self.messageEdit.append(line.strip()) | 1229 self.messageEdit.append(line.strip()) |
| 1262 | 1230 |
| 1263 changes = itm.data(0, self.__changesRole) | 1231 changes = itm.data(0, self.__changesRole) |
