[PATCH 1 of 3] templater: ignore orig/rej files

[Pierre-Yves David]

On 03/08/2016 07:44 PM, timeless wrote:
> # HG changeset patch
> # User timeless <timeless at mozdev.org>
> # Date 1456896427 0
> #      Wed Mar 02 05:27:07 2016 +0000
> # Node ID 94616d85ab4517fe06424dc1760844de0f4a664e
> # Parent  9974b8236cac50945d7b529e7c4fae9cf4974443
> templater: ignore orig/rej files

Can you elaborate about what this is about?

>
> diff --git a/mercurial/templater.py b/mercurial/templater.py
> --- a/mercurial/templater.py
> +++ b/mercurial/templater.py
> @@ -853,6 +853,8 @@
>       stylelist = []
>       for file in dirlist:
>           split = file.split(".")
> +        if split[-1] in ('orig', 'rej'):
> +            continue
>           if split[0] == "map-cmdline":
>               stylelist.append(split[1])
>       return ", ".join(sorted(stylelist))
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>

-- 
Pierre-Yves David