Show More
@@ -1087,7 +1087,7 b' def gettemplate(ui, tmpl, style):' | |||
|
1087 | 1087 | """ |
|
1088 | 1088 | |
|
1089 | 1089 | # ui settings |
|
1090 | if not tmpl and not style: | |
|
1090 | if not tmpl and not style: # template are stronger than style | |
|
1091 | 1091 | tmpl = ui.config('ui', 'logtemplate') |
|
1092 | 1092 | if tmpl: |
|
1093 | 1093 | try: |
@@ -1098,7 +1098,7 b' def gettemplate(ui, tmpl, style):' | |||
|
1098 | 1098 | else: |
|
1099 | 1099 | style = util.expandpath(ui.config('ui', 'style', '')) |
|
1100 | 1100 | |
|
1101 | if style: | |
|
1101 | if not tmpl and style: | |
|
1102 | 1102 | mapfile = style |
|
1103 | 1103 | if not os.path.split(mapfile)[0]: |
|
1104 | 1104 | mapname = (templater.templatepath('map-cmdline.' + mapfile) |
General Comments 0
You need to be logged in to leave comments.
Login now