Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- changeset 7183
- 4ac1c9daa90b
- parent 7142
- b0321ba66119
- child 7187
- 11b0c7802a70
equal
deleted
inserted
replaced
| 7181:46ac11be8058 | 7183:4ac1c9daa90b |
|---|---|
| 432 self.__revColors = {} | 432 self.__revColors = {} |
| 433 self.__revColor = 0 | 433 self.__revColor = 0 |
| 434 | 434 |
| 435 self.__branchColors = {} | 435 self.__branchColors = {} |
| 436 | 436 |
| 437 self.__projectRevision = -1 | 437 self.__projectWorkingDirParents = [] |
| 438 self.__projectBranch = "" | 438 self.__projectBranch = "" |
| 439 | 439 |
| 440 self.__childrenInfo = collections.defaultdict(list) | 440 self.__childrenInfo = collections.defaultdict(list) |
| 441 | 441 |
| 442 def closeEvent(self, e): | 442 def closeEvent(self, e): |
| 834 errMsg) | 834 errMsg) |
| 835 | 835 |
| 836 if output: | 836 if output: |
| 837 outputList = output.strip().split(None, 1) | 837 outputList = output.strip().split(None, 1) |
| 838 if len(outputList) == 2: | 838 if len(outputList) == 2: |
| 839 self.__projectRevision = outputList[0].strip() | 839 outputRevs = outputList[0].strip() |
| 840 if self.__projectRevision.endswith("+"): | 840 if outputRevs.endswith("+"): |
| 841 self.__projectRevision = self.__projectRevision[:-1] | 841 outputRevs = outputRevs[:-1] |
| 842 self.__projectWorkingDirParents = outputRevs.split('+') | |
| 842 self.__projectBranch = outputList[1].strip() | 843 self.__projectBranch = outputList[1].strip() |
| 843 | 844 |
| 844 def __getClosedBranches(self): | 845 def __getClosedBranches(self): |
| 845 """ | 846 """ |
| 846 Private method to get the list of closed branches. | 847 Private method to get the list of closed branches. |
| 1067 else: | 1068 else: |
| 1068 topedges = None | 1069 topedges = None |
| 1069 | 1070 |
| 1070 icon = self.__generateIcon(column, color, edges, topedges, | 1071 icon = self.__generateIcon(column, color, edges, topedges, |
| 1071 QColor(self.__branchColor(branches[0])), | 1072 QColor(self.__branchColor(branches[0])), |
| 1072 rev == self.__projectRevision, | 1073 rev in self.__projectWorkingDirParents, |
| 1073 rev in self.__closedBranchesRevs, | 1074 rev in self.__closedBranchesRevs, |
| 1074 phase == "draft") | 1075 phase == "draft") |
| 1075 itm.setIcon(0, icon) | 1076 itm.setIcon(0, icon) |
| 1076 | 1077 |
| 1077 try: | 1078 try: |
