On Tue, 29 Jan 2019 23:45:46 -0800, Ludovic Chabant wrote:
> # HG changeset patch
> # User Ludovic Chabant <ludo...@chabant.com>
> # Date 1548831555 28800
> # Tue Jan 29 22:59:15 2019 -0800
> # Node ID 7127fdab8807f3a3bcf2b1eebb1ee4084233f21f
> # Parent ef0e2f7224358c32b0f62b13e83e89ba2399c8cf
> extdiff: add --per-file and --confirm options
Queued this, thanks.
> diff --git a/hgext/extdiff.py b/hgext/extdiff.py
> --- a/hgext/extdiff.py
> +++ b/hgext/extdiff.py
> @@ -71,6 +71,7 @@
> import re
> import shutil
> import stat
> +import subprocess
Unused in this version. Removed.
> - def __init__(self, path, cmdline):
> + def __init__(self, cmd, path, cmdline):
> # We can't pass non-ASCII through docstrings (and path is
> # in an unknown encoding anyway), but avoid double separators on
> # Windows
> docpath = stringutil.escapestr(path).replace(b'\\\\', b'\\')
> self.__doc__ %= {r'path':
> pycompat.sysstr(stringutil.uirepr(docpath))}
> self._cmdline = cmdline
> + self._cmd = cmd
>
> def __call__(self, ui, repo, *pats, **opts):
> opts = pycompat.byteskwargs(opts)
> @@ -440,7 +528,7 @@
> cmdline += ' ' + args
> command(cmd, extdiffopts[:], _('hg %s [OPTION]... [FILE]...') % cmd,
> helpcategory=command.CATEGORY_FILE_CONTENTS,
> - inferrepo=True)(savedcmd(path, cmdline))
> + inferrepo=True)(savedcmd(cmd, path, cmdline))
Looks like unrelated change. Also removed.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
