Mercurial > hg
changeset 22603:f768c888aaa6 stable 3.1.2
merge with i18n
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Oct 2014 12:35:18 -0500 |
parents | 551d776a0a9a (diff) a89510c909ca (current diff) |
children | 5da9c178d500 |
files | |
diffstat | 3 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Tue Sep 30 13:43:30 2014 -0300 +++ b/mercurial/cmdutil.py Wed Oct 01 12:35:18 2014 -0500 @@ -1087,7 +1087,7 @@ """ # ui settings - if not tmpl and not style: + if not tmpl and not style: # template are stronger than style tmpl = ui.config('ui', 'logtemplate') if tmpl: try: @@ -1098,7 +1098,7 @@ else: style = util.expandpath(ui.config('ui', 'style', '')) - if style: + if not tmpl and style: mapfile = style if not os.path.split(mapfile)[0]: mapname = (templater.templatepath('map-cmdline.' + mapfile)
--- a/mercurial/help/config.txt Tue Sep 30 13:43:30 2014 -0300 +++ b/mercurial/help/config.txt Wed Oct 01 12:35:18 2014 -0500 @@ -467,6 +467,9 @@ ``git`` Use git extended diff format. +``nobinary`` + Omit git binary patches. + ``nodates`` Don't include dates in diff headers.
--- a/tests/test-command-template.t Tue Sep 30 13:43:30 2014 -0300 +++ b/tests/test-command-template.t Wed Oct 01 12:35:18 2014 -0500 @@ -86,6 +86,11 @@ $ hg log -l1 -T./map-simple 8 +Template should precede style option + + $ hg log -l1 --style default -T '{rev}\n' + 8 + Default style is like normal output: $ hg log > log.out