[PATCH 2 of 3 V2] record: add default value for operation argument
Augie Fackler
raf at durin42.com
Fri May 29 16:04:35 CDT 2015
On Fri, May 29, 2015 at 10:30:33AM -0700, Laurent Charignon wrote:
> # HG changeset patch
> # User Laurent Charignon <lcharignon at fb.com>
> # Date 1432767370 25200
> # Wed May 27 15:56:10 2015 -0700
> # Node ID 0e7be64e7fe2b7673dc5b0c256cdb58bafb47f09
> # Parent d9e0f5fc28d2ffd25728cf923888fd302c37ad82
> record: add default value for operation argument
Queued patches one and two, thanks.
>
> This patch is part of a series of patches to change the recording ui to reflect
> the operation currently running (commit, shelve, revert ...).
> This patch adds the default value of the operation argument for record's
> standard and curses interface to match what is displayed in the interface
> as of today.
>
> diff --git a/mercurial/crecord.py b/mercurial/crecord.py
> --- a/mercurial/crecord.py
> +++ b/mercurial/crecord.py
> @@ -428,6 +428,8 @@
> def filterpatch(ui, chunks, chunkselector, operation=None):
> """interactively filter patch chunks into applied-only chunks"""
>
> + if operation is None:
> + operation = _('confirm')
> chunks = list(chunks)
> # convert chunks list into structure suitable for displaying/modifying
> # with curses. create a list of headers only.
> diff --git a/mercurial/patch.py b/mercurial/patch.py
> --- a/mercurial/patch.py
> +++ b/mercurial/patch.py
> @@ -950,6 +950,8 @@
>
> def filterpatch(ui, headers, operation=None):
> """Interactively filter patch chunks into applied-only chunks"""
> + if operation is None:
> + operation = _('record')
>
> def prompt(skipfile, skipall, query, chunk):
> """prompt query, and process base inputs
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
More information about the Mercurial-devel
mailing list