# HG changeset patch
# User mpm@selenic.com
# Date 1117852186 28800
# 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/README b/README
diff --git a/hg b/hg
diff --git a/mercurial/commands.py b/mercurial/commands.py
diff --git a/mercurial/hg.py b/mercurial/hg.py
diff --git a/mercurial/hgweb.py b/mercurial/hgweb.py
diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
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/setup.py b/setup.py
diff --git a/templates/changelogentry.tmpl b/templates/changelogentry.tmpl
--- a/templates/changelogentry.tmpl
+++ b/templates/changelogentry.tmpl
@@ -2,7 +2,7 @@
 <table width="100%" cellpadding="0" cellspacing="0">
 <tr>
  <td align="right" width="15%"><b>#date|age# ago:&nbsp;</b></td>
- <td><b>#desc|firstline|escape#</b></td</tr>
+ <td><b>#desc|firstline|escape#</b></td></tr>
 <tr>
  <td align="right">changeset #rev#:&nbsp;</td>
  <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>
@@ -10,7 +10,7 @@
 #parent2#
 <tr>
  <td align="right">author:&nbsp;</td>
- <td>#author#</td></tr>
+ <td>#author|obfuscate#</td></tr>
 <tr>
  <td align="right">date:&nbsp;</td>
  <td>#date|date#</td></tr>
diff --git a/templates/fileannotate.tmpl b/templates/fileannotate.tmpl
--- a/templates/fileannotate.tmpl
+++ b/templates/fileannotate.tmpl
@@ -28,7 +28,7 @@
  <td>#author|obfuscate#</td></tr>
 <tr>
  <td class="metatag">date:</td>
- <td>#date|date# (#date|age#) ago)</td></tr>
+ <td>#date|date# (#date|age# ago)</td></tr>
 </table>
 
 <br/>
diff --git a/templates/filelogentry.tmpl b/templates/filelogentry.tmpl
--- a/templates/filelogentry.tmpl
+++ b/templates/filelogentry.tmpl
@@ -1,7 +1,7 @@
 <table class="parity#parity#" width="100%" cellspacing="0" cellpadding="0">
 <tr>
  <td align="right" width="15%"><b>#date|age# ago:&nbsp;</b></td>
- <td><b><a href="?cmd=changeset;node=#node#">#desc|firstline|escape#</a></b></td</tr>
+ <td><b><a href="?cmd=changeset;node=#node#">#desc|firstline|escape#</a></b></td></tr>
 <tr>
  <td align="right">revision #filerev#:&nbsp;</td>
  <td><a href="?cmd=file;file=#file#;filenode=#filenode#">#filenode#</a>
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 = "<div class="parity#parity#"><span class="lineno">#linenumber# </span>#line|escape#</div>"
 filelogentry = filelogentry.tmpl
-annotateline = "<tr class="parity#parity#"><td class="annotate"><a href="?cmd=changeset;node=#node#">#author#@#rev#</a></td><td><pre>#line|escape#</pre></td></tr>"
+annotateline = "<tr class="parity#parity#"><td class="annotate"><a href="?cmd=changeset;node=#node#">#author|obfuscate#@#rev#</a></td><td><pre>#line|escape#</pre></td></tr>"
 difflineplus = "<span class="plusline">#line|escape#</span>"
 difflineminus = "<span class="minusline">#line|escape#</span>"
 difflineat = "<span class="atline">#line|escape#</span>"
@@ -27,4 +27,4 @@ filerevparent = "<tr><td class="metatag"
 fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=annotate;file=#file#;filenode=#node#">#node#</a></td></tr>"
 tags = tags.tmpl
 tagentry = "<div class="parity#parity#"><tt>#node#</tt> <a href="?cmd=changeset;node=#node#">#tag#</a><br /></div>"
-diffblock = "<div class="parity#parity#">#lines#</div>"
\ No newline at end of file
+diffblock = "<div class="parity#parity#">#lines#</div>"