Show More
@@ -1087,7 +1087,7 b' def gettemplate(ui, tmpl, style):' | |||||
1087 | """ |
|
1087 | """ | |
1088 |
|
1088 | |||
1089 | # ui settings |
|
1089 | # ui settings | |
1090 | if not tmpl and not style: |
|
1090 | if not tmpl and not style: # template are stronger than style | |
1091 | tmpl = ui.config('ui', 'logtemplate') |
|
1091 | tmpl = ui.config('ui', 'logtemplate') | |
1092 | if tmpl: |
|
1092 | if tmpl: | |
1093 | try: |
|
1093 | try: | |
@@ -1098,7 +1098,7 b' def gettemplate(ui, tmpl, style):' | |||||
1098 | else: |
|
1098 | else: | |
1099 | style = util.expandpath(ui.config('ui', 'style', '')) |
|
1099 | style = util.expandpath(ui.config('ui', 'style', '')) | |
1100 |
|
1100 | |||
1101 | if style: |
|
1101 | if not tmpl and style: | |
1102 | mapfile = style |
|
1102 | mapfile = style | |
1103 | if not os.path.split(mapfile)[0]: |
|
1103 | if not os.path.split(mapfile)[0]: | |
1104 | mapname = (templater.templatepath('map-cmdline.' + mapfile) |
|
1104 | mapname = (templater.templatepath('map-cmdline.' + mapfile) |
@@ -86,6 +86,11 b' Test templates and style maps in files:' | |||||
86 | $ hg log -l1 -T./map-simple |
|
86 | $ hg log -l1 -T./map-simple | |
87 | 8 |
|
87 | 8 | |
88 |
|
88 | |||
|
89 | Template should precede style option | |||
|
90 | ||||
|
91 | $ hg log -l1 --style default -T '{rev}\n' | |||
|
92 | 8 | |||
|
93 | ||||
89 | Default style is like normal output: |
|
94 | Default style is like normal output: | |
90 |
|
95 | |||
91 | $ hg log > log.out |
|
96 | $ hg log > log.out |
General Comments 0
You need to be logged in to leave comments.
Login now