[PATCH 2 of 4] context: also take all other arguments than `patch.diff` accept

Yuya Nishihara yuya at tcha.org
Thu May 24 09:37:48 EDT 2018


On Thu, 24 May 2018 10:38:55 +0200, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld <boris.feld at octobus.net>
> # Date 1527082300 -7200
> #      Wed May 23 15:31:40 2018 +0200
> # Node ID 2f2232e5f0b60a3dd591ea16dfffc3c0a050acdc
> # Parent  4e013ebfa2c64f1849cb3a4242c47da981b35198
> # EXP-Topic diff-cleanup
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 2f2232e5f0b6
> context: also take all other arguments than `patch.diff` accept
> 
> This is needed to use `context.diff` as a full replacement of `patch.diff`
> 
> diff --git a/mercurial/context.py b/mercurial/context.py
> --- a/mercurial/context.py
> +++ b/mercurial/context.py
> @@ -294,14 +294,19 @@ class basectx(object):
>                                auditor=r.nofsauditor, ctx=self,
>                                listsubrepos=listsubrepos, badfn=badfn)
>  
> -    def diff(self, ctx2=None, match=None, opts=None):
> +    def diff(self, ctx2=None, match=None, changes=None, opts=None,
> +            losedatafn=None, prefix='', relroot='', copy=None,
> +            hunksfilterfn=None, diffopts=None):

Unused 'diffopts'.

And I'm not sure if 'changes' and 'losedatafn' are useful as changectx APIs.
They look quite low-level.


More information about the Mercurial-devel mailing list