diff -r 46ac11be8058 -r 4ac1c9daa90b eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Thu Aug 29 19:09:18 2019 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Aug 30 18:54:30 2019 +0200
@@ -434,7 +434,7 @@
self.__branchColors = {}
- self.__projectRevision = -1
+ self.__projectWorkingDirParents = []
self.__projectBranch = ""
self.__childrenInfo = collections.defaultdict(list)
@@ -836,9 +836,10 @@
if output:
outputList = output.strip().split(None, 1)
if len(outputList) == 2:
- self.__projectRevision = outputList[0].strip()
- if self.__projectRevision.endswith("+"):
- self.__projectRevision = self.__projectRevision[:-1]
+ outputRevs = outputList[0].strip()
+ if outputRevs.endswith("+"):
+ outputRevs = outputRevs[:-1]
+ self.__projectWorkingDirParents = outputRevs.split('+')
self.__projectBranch = outputList[1].strip()
def __getClosedBranches(self):
@@ -1069,7 +1070,7 @@
icon = self.__generateIcon(column, color, edges, topedges,
QColor(self.__branchColor(branches[0])),
- rev == self.__projectRevision,
+ rev in self.__projectWorkingDirParents,
rev in self.__closedBranchesRevs,
phase == "draft")
itm.setIcon(0, icon)
