Submitter | Yuya Nishihara |
---|---|
Date | May 21, 2018, 12:22 p.m. |
Message ID | <11795e08de913fd3285f.1526905363@mimosa> |
Download | mbox | patch |
Permalink | /patch/31773/ |
State | Accepted |
Headers | show
Return-Path: <mercurial-devel-bounces@mercurial-scm.org> X-Original-To: patchwork@mercurial-scm.org Delivered-To: patchwork@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id 9690D2C299; Mon, 21 May 2018 08:23:09 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id yT3bn2DlpSSh; Mon, 21 May 2018 08:23:09 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id 08DFC2C336; Mon, 21 May 2018 08:23:07 -0400 (EDT) X-Original-To: mercurial-devel@mercurial-scm.org Delivered-To: mercurial-devel@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id AC0C72C2BA for <mercurial-devel@mercurial-scm.org>; Mon, 21 May 2018 08:23:05 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id cfgD7vjoCkM0 for <mercurial-devel@mercurial-scm.org>; Mon, 21 May 2018 08:23:05 -0400 (EDT) Received: from mail-pg0-x22c.google.com (mail-pg0-x22c.google.com [IPv6:2607:f8b0:400e:c05::22c]) by mercurial-scm.org (Postfix) with ESMTPS id 6C36E2C2BD for <mercurial-devel@mercurial-scm.org>; Mon, 21 May 2018 08:23:04 -0400 (EDT) Received: by mail-pg0-x22c.google.com with SMTP id p8-v6so6295416pgq.10 for <mercurial-devel@mercurial-scm.org>; Mon, 21 May 2018 05:23:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:mime-version:content-transfer-encoding:subject:message-id :in-reply-to:references:user-agent:date:from:to; bh=VJN19fNloWJTvkA1FJO59k0wSUaHfn5kAR1DuS6UR14=; b=UN3BmSaL5JDGvcgq1rsTtODx0+jfkB9wuVngczdbQEXJ0HNd4oCrZquiK03ZUEi1kb j37LF3p+Xq/eXZZHyCm4E48QatqTPyS/oyezIm9ttNqCyfEVANs7w26pLYo8fcudoX6P Q6nZOxJAsOs6/vzTawdQ68KwWXV+nz2dSfIUPx15drVqqPZbQqIP/4FSin8NDCyOPFMq nEJw4df2G5nXUUAyRBeNbmTpwU3JPUywRUE4uz0Rw4D8pRXlTtjI1HVGHIvorb7VBhq/ zlASbNFZ4H4NJfesVGJK5fPp72YzQ5viHox/FMQIBBTlG3aDuwm6hP3Cp7WZbJ4mH0yR FxUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:mime-version:content-transfer-encoding :subject:message-id:in-reply-to:references:user-agent:date:from:to; bh=VJN19fNloWJTvkA1FJO59k0wSUaHfn5kAR1DuS6UR14=; b=tUeatY1Zjto8oeKbiscckjaqCTmRU32dqsiTcni/6jlccZDQOBZpaaQNXOpm2qc2BO h/bMCt8igtd91JN2ztWtVByt9Ff3u1xA1wL9yLLiNgD1uj1JhGQ33eoo48jDluCjXDk3 MonyDpzYsiIIOSrII0+8Qv4zYQ2iheRq/HP+hYXOoht9V/wGW0HHsfPgWtuKLUxqC3/B PLOvSxERmCUvfT2NfKh2EyFNT9B++aZG7i9/CA2bY5W0/3bmDLJS+kpzwGgTByiqhXDb T/pouoQFxj2/FuVE0TOaJspitlAGSf/+cN9tlayx/0U6F6WNoN8iHEfNEeHLH7XbSjF0 fKbA== X-Gm-Message-State: ALKqPwchkemHFctyy+igjCA+zXhm5NcpkR7AjpAu4zkzFFvTGDPn366k 1U0LqFPeMWmED5a1gGBMRlMngyZM X-Google-Smtp-Source: AB8JxZpES92DdvxGuPVo0FBJBiQ1RCOKoW+q+MkiNcRHb/BmpwsQjhGH3WGgxk4lFM54heQdQJAMQg== X-Received: by 2002:a63:34c1:: with SMTP id b184-v6mr330837pga.396.1526905383042; Mon, 21 May 2018 05:23:03 -0700 (PDT) Received: from [127.0.1.1] (pdb6fbe2b.tkyea126.ap.so-net.ne.jp. [219.111.190.43]) by smtp.gmail.com with ESMTPSA id p6-v6sm26075128pfg.157.2018.05.21.05.23.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 May 2018 05:23:02 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 6 of 8] hgweb: wrap {diffopts} of annotate by hybriddict() X-Mercurial-Node: 11795e08de913fd3285f9052599e32d3dcde0c0d X-Mercurial-Series-Index: 6 X-Mercurial-Series-Total: 8 Message-Id: <11795e08de913fd3285f.1526905363@mimosa> X-Mercurial-Series-Id: <56e8ac64a7a3d529a596.1526905358@mimosa> In-Reply-To: <56e8ac64a7a3d529a596.1526905358@mimosa> References: <56e8ac64a7a3d529a596.1526905358@mimosa> User-Agent: Mercurial-patchbomb/4.6+158-0fa050bc68cb Date: Mon, 21 May 2018 21:22:43 +0900 From: Yuya Nishihara <yuya@tcha.org> To: mercurial-devel@mercurial-scm.org X-BeenThere: mercurial-devel@mercurial-scm.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <mercurial-devel.mercurial-scm.org> List-Unsubscribe: <https://www.mercurial-scm.org/mailman/options/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=unsubscribe> List-Archive: <http://www.mercurial-scm.org/pipermail/mercurial-devel/> List-Post: <mailto:mercurial-devel@mercurial-scm.org> List-Help: <mailto:mercurial-devel-request@mercurial-scm.org?subject=help> List-Subscribe: <https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org> |
Comments
Yuya Nishihara - May 21, 2018, 12:22 p.m.
Patch
diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py +++ b/mercurial/hgweb/webcommands.py @@ -992,7 +992,7 @@ def annotate(web): rename=webutil.renamelink(fctx), permissions=fctx.manifest().flags(f), ishead=int(ishead), - diffopts=diffopts, + diffopts=templateutil.hybriddict(diffopts), **pycompat.strkwargs(webutil.commonentry(web.repo, fctx))) @webcommand('filelog')