Mercurial > kallithea

changeset 4337:394cafce8d31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graph: if the child has multiple parents then use the parents color - also when close to the child
author Mads Kiilerich <madski@unity3d.com>
date Tue, 10 Dec 2013 19:30:37 +0100
parents 7f2a5a6d732c
children 42bc65838fd1
files kallithea/lib/graphmod.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/graphmod.py	Fri Jul 18 18:44:54 2014 +0200
+++ b/kallithea/lib/graphmod.py	Tue Dec 10 19:30:37 2013 +0100
@@ -131,7 +131,7 @@
                 for p in parents:
                     bconf = getconf(p)
                     edges.append((
-                        ecol, next.index(p), color,
+                        ecol, next.index(p), colors[p] if len(parents) > 1 else color,
                         bconf.get('width', -1),
                         bconf.get('color', '')))