# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1456896427 0
# Node ID d2e154dddb6e1c5434d89f67c54d8c10efb32c64
# Parent  7f77e71e5d7eb69a5b5d3366d187f9914d1d439a
templater: ignore orig/rej files

If your mercurial/templates/ directory is dirty, then the template system would
otherwise import duplicate templates from the .orig files and potentially try to
parse .rej files.

Since editing/reverting these templates isn't an unexpected action, and since
they're in .hgignore, it's best that the template system know to skip them."

diff -r 7f77e71e5d7e -r d2e154dddb6e mercurial/templater.py
--- a/mercurial/templater.py	Thu Dec 24 04:31:34 2015 +0000
+++ b/mercurial/templater.py	Wed Mar 02 05:27:07 2016 +0000
@@ -891,6 +891,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))