diff mercurial/commands.py @ 3193:a6d0cd63068c

Make "hg log --style=changelog > changelog" work (issue338)
Style files in templates/ now take precedence over current directory.
This can be overridden with --style=./changelog if really neeeded.
Added test for issue338.

--- a/mercurial/commands.py	Fri Sep 29 19:43:07 2006 +0200
+++ b/mercurial/commands.py	Fri Sep 29 21:24:15 2006 +0200
@@ -399,9 +399,9 @@
 
     if tmpl or mapfile:
         if mapfile:
-            if not os.path.isfile(mapfile):
-                mapname = templater.templatepath('map-cmdline.' + mapfile)
-                if not mapname: mapname = templater.templatepath(mapfile)
+            if not os.path.split(mapfile)[0]:
+                mapname = (templater.templatepath('map-cmdline.' + mapfile)
+                           or templater.templatepath(mapfile))
                 if mapname: mapfile = mapname
         try:
             t = templater.changeset_templater(ui, repo, mapfile)