# HG changeset patch # User Yuya Nishihara # Date 1457103696 -32400 # Node ID ccb33e965150a881a67ef577e351ea2d012fd896 # Parent 542d200bd2611003f72d3b1cce4b1277844d2e0d color: make label() template function stringify "expr" argument first Since label() should return a string (or a thunk to be evaluated to a string), this change is okay. This helps porting to evalstring() helper. See the next patch for details. diff -r 542d200bd261 -r ccb33e965150 hgext/color.py --- a/hgext/color.py Sun Feb 14 13:09:17 2016 +0900 +++ b/hgext/color.py Sat Mar 05 00:01:36 2016 +0900 @@ -490,6 +490,7 @@ mapping.update(dict([(k, k) for k in _effects])) thing = args[1][0](context, mapping, args[1][1]) + thing = templater.stringify(thing) # apparently, repo could be a string that is the favicon? repo = mapping.get('repo', '') @@ -497,8 +498,6 @@ return thing label = args[0][0](context, mapping, args[0][1]) - - thing = templater.stringify(thing) label = templater.stringify(label) return repo.ui.label(thing, label)