[PATCH 6 of 6] hgweb: wrap {branch} and {changesetbranch} by hybridlist()

Yuya Nishihara yuya at tcha.org
Tue May 8 09:45:33 EDT 2018


# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1522595199 -32400
#      Mon Apr 02 00:06:39 2018 +0900
# Node ID b8887d7a2962c450cb9d1aa2be447f102ae776ab
# Parent  2fc6f64325ac21c8ed667453c1c62784a082667f
hgweb: wrap {branch} and {changesetbranch} by hybridlist()

This is also a 0/1-length list of a simple value, can be a hybrid list.
Appears that we have many {branch} variants.

diff --git a/mercurial/hgweb/webutil.py b/mercurial/hgweb/webutil.py
--- a/mercurial/hgweb/webutil.py
+++ b/mercurial/hgweb/webutil.py
@@ -271,8 +271,8 @@ def nodebranchnodefault(ctx):
     branches = []
     branch = ctx.branch()
     if branch != 'default':
-        branches.append({"name": branch})
-    return branches
+        branches.append(branch)
+    return templateutil.hybridlist(branches, name='name')
 
 def showtag(repo, tmpl, t1, node=nullid, **args):
     args = pycompat.byteskwargs(args)


More information about the Mercurial-devel mailing list