diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -30,7 +30,7 @@ class ui: self.write("unrecognized response\n") def status(self, *msg): if not self.quiet: self.write(*msg) - def warn(self, msg): + def warn(self, *msg): self.write(*msg) def note(self, *msg): if self.verbose: self.write(*msg) diff --git a/templates/changelogentry.tmpl b/templates/changelogentry.tmpl --- a/templates/changelogentry.tmpl +++ b/templates/changelogentry.tmpl @@ -2,7 +2,7 @@
#date|age# ago: | -#desc|firstline|escape# | +#desc|firstline|escape# |
changeset #rev#: | #node# | |
author: | -#author# | #author|obfuscate# |
date: | #date|date# | #author|obfuscate# |
date: | -#date|date# (#date|age#) ago) | #date|date# (#date|age# ago) |
#date|age# ago: | -#desc|firstline|escape# | +#desc|firstline|escape# |
revision #filerev#: | #filenode#
diff --git a/templates/map b/templates/map
--- a/templates/map
+++ b/templates/map
@@ -16,7 +16,7 @@ filediff = filediff.tmpl
filelog = filelog.tmpl
fileline = " #linenumber# #line|escape# "
filelogentry = filelogentry.tmpl
-annotateline = " | |
#author#@#rev# | #line|escape# | |
#author|obfuscate#@#rev# | #line|escape# | |
parent: | #node# |