# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 2016-08-26 14:38:52
# Node ID 42751543fa06171a5181f75df66f9e16222953c1
# Parent  ed793f41e83fb25e77ace9e0e5d5f5674ba52bff

version: change "place" field of extension to "bundled" flag

The name "place" sounds odd. We can simply expose raw boolean values instead
of switching external/internal literals.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -7297,14 +7297,13 @@ def version_(ui, **opts):
     fn = fm.nested("extensions")
     if names:
         namefmt = "  %%-%ds  " % max(len(n) for n in names)
-        if fn:
-            places = ["external", "internal"]
-        else:
-            places = [_("external"), _("internal")]
+        places = [_("external"), _("internal")]
         for n, v, p in zip(names, vers, isinternals):
             fn.startitem()
             fn.condwrite(ui.verbose, "name", namefmt, n)
-            fn.condwrite(ui.verbose, "place", "%s  ", places[p])
+            if ui.verbose:
+                fn.plain("%s  " % places[p])
+            fn.data(bundled=p)
             fn.condwrite(ui.verbose and v, "ver", "%s", v)
             if ui.verbose:
                 fn.plain("\n")
diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -1253,15 +1253,15 @@ Test JSON output of version:
   $ hg version --config extensions.throw=throw.py -Tjson
   [
    {
-    "extensions": [{"name": "throw", "place": "external", "ver": "1.twentythree"}],
+    "extensions": [{"bundled": false, "name": "throw", "ver": "1.twentythree"}],
     "ver": "3.2.2"
    }
   ]
 
-  $ LANGUAGE= LC_ALL=ja_JP.UTF-8 hg version --config extensions.strip= -Tjson
+  $ hg version --config extensions.strip= -Tjson
   [
    {
-    "extensions": [{"name": "strip", "place": "internal", "ver": null}],
+    "extensions": [{"bundled": true, "name": "strip", "ver": null}],
     "ver": "*" (glob)
    }
   ]
@@ -1269,7 +1269,7 @@ Test JSON output of version:
 Test template output of version:
 
   $ hg version --config extensions.throw=throw.py --config extensions.strip= \
-  > -T'{extensions % "{name}  {pad(ver, 16)}  ({place})\n"}'
+  > -T'{extensions % "{name}  {pad(ver, 16)}  ({if(bundled, "internal", "external")})\n"}'
   throw  1.twentythree     (external)
   strip                    (internal)