On 08/22/2016 04:44 PM, Yuya Nishihara wrote:
# HG changeset patch
# User Yuya Nishihara <y...@tcha.org>
# Date 1471331947 -32400
# Tue Aug 16 16:19:07 2016 +0900
# Node ID fc30d32758af268847d2b9b200071c7b58cd6050
# Parent f6e34ad8025ba31a7ef463205c14a450c44baea6
version: add formatter support
The license message isn't exported, which I don't think is useful and I
couldn't find a way to restructure it for JSON or template outputs.
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -7241,36 +7241,49 @@ def verify(ui, repo):
"""
return hg.verify(repo)
-@command('version', [], norepo=True)
-def version_(ui):
+@command('version', [] + formatteropts, norepo=True)
+def version_(ui, **opts):
"""output version and copyright information"""
- ui.write(_("Mercurial Distributed SCM (version %s)\n")
- % util.version())
- ui.status(_(
+ fm = ui.formatter("version", opts)
+ fm.startitem()
+ fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
+ util.version())
+ license = _(
"(see https://mercurial-scm.org for more information)\n"
"\nCopyright (C) 2005-2016 Matt Mackall and others\n"
"This is free software; see the source for copying conditions. "
"There is NO\nwarranty; "
"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
- ))
-
- ui.note(_("\nEnabled extensions:\n\n"))
+ )
+ if not ui.quiet:
+ fm.plain(license)
+
+ if ui.verbose:
+ fm.plain(_("\nEnabled extensions:\n\n"))
# format names and versions into columns
names = []
vers = []
isinternals = []
for name, module in extensions.extensions():
names.append(name)
- vers.append(extensions.moduleversion(module))
+ vers.append(extensions.moduleversion(module) or None)
isinternals.append(extensions.ismoduleinternal(module))
+ fn = fm.nested("extensions")
if names:
- maxnamelen = max(len(n) for n in names)
- places = [_("external"), _("internal")]
Place sounds a bit strange to me. We can probably find something a bit
better like "bundled (true/False)" or 'vendor'
internal/external(/vendorname?).
In all case this can be done as a followup.
--
Pierre-Yves David
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
