# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1522843281 -32400
# Node ID 61cecab0cc20ca5d5fe94d8e0ae06ad18af26e23
# Parent  b865bba56db1a6ee14d6249ac071d1ad36169ec9
templater: inline unwrapvalue()

The current unwrapvalue() will be superseded by _unwrapvalue().

Note that _unwrapvalue() can simply return thing.tovalue() if thing is a
wrapped object. That's because tovalue() is guaranteed to not return a
generator of strings.

diff -r b865bba56db1 -r 61cecab0cc20 mercurial/templateutil.py
--- a/mercurial/templateutil.py	Sun May 13 23:18:26 2018 +0200
+++ b/mercurial/templateutil.py	Wed Apr 04 21:01:21 2018 +0900
@@ -461,7 +461,8 @@
 # is fixed. we can't do that right now because join() has to take a generator
 # of byte strings as it is, not a lazy byte string.
 def _unwrapvalue(context, mapping, thing):
-    thing = unwrapvalue(context, mapping, thing)
+    if isinstance(thing, wrapped):
+        return thing.tovalue(context, mapping)
     # evalrawexp() may return string, generator of strings or arbitrary object
     # such as date tuple, but filter does not want generator.
     return _unthunk(context, mapping, thing)
@@ -476,7 +477,8 @@
             thing = stringutil.parsebool(data)
     else:
         thing = func(context, mapping, data)
-    thing = unwrapvalue(context, mapping, thing)
+    if isinstance(thing, wrapped):
+        thing = thing.tovalue(context, mapping)
     if isinstance(thing, bool):
         return thing
     # other objects are evaluated as strings, which means 0 is True, but