Patchwork [remotenames] remotenames: fix parameter ordering

login
register
mail settings
Submitter Wez Furlong
Date April 18, 2017, 8:55 p.m.
Message ID <87fa8cb8721726dcbe2c.1492548916@devbig310.prn1.facebook.com>
Download mbox | patch
Permalink /patch/20258/
State Accepted
Delegated to: Ryan McElroy
Headers show

Comments

Wez Furlong - April 18, 2017, 8:55 p.m.
# HG changeset patch
# User Wez Furlong <wez@fb.com>
# Date 1492546015 25200
#      Tue Apr 18 13:06:55 2017 -0700
# Node ID 87fa8cb8721726dcbe2c6a313b70ac770e0fc5ae
# Parent  b55f98398522d9c7cf81ab191ddd322926699b0a
remotenames: fix parameter ordering

Summary: templater function signature changed upstream

Test Plan: rt

Reviewers: #mercurial, quark

Reviewed By: quark

Differential Revision: https://phabricator.intern.facebook.com/D4908240

Signature: t1:4908240:1492545063:0d726e99e065bf231a2fcf894a1722e02e038650
Ryan McElroy - April 19, 2017, 1:38 p.m.
On 4/18/17 9:55 PM, Wez Furlong wrote:
> # HG changeset patch
> # User Wez Furlong <wez@fb.com>
> # Date 1492546015 25200
> #      Tue Apr 18 13:06:55 2017 -0700
> # Node ID 87fa8cb8721726dcbe2c6a313b70ac770e0fc5ae
> # Parent  b55f98398522d9c7cf81ab191ddd322926699b0a
> remotenames: fix parameter ordering

Thanks for the fix!

>
> Summary: templater function signature changed upstream
>
> Test Plan: rt
>
> Reviewers: #mercurial, quark
>
> Reviewed By: quark
>
> Differential Revision: https://phabricator.intern.facebook.com/D4908240
>
> Signature: t1:4908240:1492545063:0d726e99e065bf231a2fcf894a1722e02e038650

All this facebooky phabricator stuff isn't super helpful on the list :-p

>
> diff --git a/remotenames.py b/remotenames.py
> --- a/remotenames.py
> +++ b/remotenames.py
> @@ -1723,8 +1723,8 @@
>       if (not remotenames or not suppress) and 'remotebranches' in repo.names:
>           remotenames += repo.names['remotebranches'].names(repo, ctx.node())
>   
> -    return templatekw.showlist('remotename', remotenames,
> -                               plural='remotenames', **args)
> +    return templatekw.showlist('remotename', remotenames, args,
> +                               plural='remotenames')
>   
>   #############################
>   # bookmarks api compatibility
>

I'll take this upstream with changes to the commit message in-flight.

Patch

diff --git a/remotenames.py b/remotenames.py
--- a/remotenames.py
+++ b/remotenames.py
@@ -1723,8 +1723,8 @@ 
     if (not remotenames or not suppress) and 'remotebranches' in repo.names:
         remotenames += repo.names['remotebranches'].names(repo, ctx.node())
 
-    return templatekw.showlist('remotename', remotenames,
-                               plural='remotenames', **args)
+    return templatekw.showlist('remotename', remotenames, args,
+                               plural='remotenames')
 
 #############################
 # bookmarks api compatibility