# HG changeset patch # User Pierre-Yves David # Date 1498034778 -7200 # Node ID 41b081ac2145d88ba1fe494630ce69652f016078 # Parent 27ba0d8dc26cac137430618f327969cb83c4d9f4 profiling: cope with configwith default value handling changes Changeset 6ff6eb33f353 change 'configwith' behavior so that the default value is run through the conversion function. In parallel a new user of 'configwith' got introduced unaware of this coming behavior change. This broke profiling. We resolve the situation by having the new conversion function cope with a default value already using the right type. diff -r 27ba0d8dc26c -r 41b081ac2145 mercurial/profiling.py --- a/mercurial/profiling.py Tue Jun 20 14:00:41 2017 -0700 +++ b/mercurial/profiling.py Wed Jun 21 10:46:18 2017 +0200 @@ -126,6 +126,8 @@ kwargs = {} def fraction(s): + if isinstance(s, (float, int)): + return float(s) if s.endswith('%'): v = float(s[:-1]) / 100 else: