# HG changeset patch # User mpm@selenic.com # Date 2005-06-04 02:29:46 # Node ID afe895fcc0d00db4b92ed07364a212486698288b # Parent 737c66b682900d82aaca6aa0310c0defd42302af # Parent 4f802588cdfbe71a17a754bd5c477b2c2e8239c5 Resolve bits from TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Resolve bits from TAH manifest hash: dc639d419de857b22da9f707cbb557c328eb12f5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoRIaywK+sNU5EO8RAswQAKCiEcQ5RV3C2JZXgQBch28VO3NpSgCdEzcD Td8bV8IKVUIXtvrcy1rCZTY= =tAU7 -----END PGP SIGNATURE----- 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# |