# HG changeset patch
# User mpm@selenic.com
# Date 1117834357 28800
# Node ID 4f802588cdfbe71a17a754bd5c477b2c2e8239c5
# Parent  fc4a6e5b58121380fe3afcd3b0d9e2ced0265855# Parent  85f0420fd8485ceb1cad9b29a64d4fb54552b96e
Merge from tah



diff -r fc4a6e5b5812 -r 4f802588cdfb hg
diff -r fc4a6e5b5812 -r 4f802588cdfb mercurial/commands.py
diff -r fc4a6e5b5812 -r 4f802588cdfb mercurial/hg.py
diff -r fc4a6e5b5812 -r 4f802588cdfb mercurial/hgweb.py
diff -r fc4a6e5b5812 -r 4f802588cdfb mercurial/revlog.py
diff -r fc4a6e5b5812 -r 4f802588cdfb mercurial/ui.py
--- a/mercurial/ui.py	Fri Jun 03 12:58:47 2005 -0800
+++ b/mercurial/ui.py	Fri Jun 03 13:32:37 2005 -0800
@@ -30,7 +30,7 @@
                 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 -r fc4a6e5b5812 -r 4f802588cdfb templates/changelogentry.tmpl
--- a/templates/changelogentry.tmpl	Fri Jun 03 12:58:47 2005 -0800
+++ b/templates/changelogentry.tmpl	Fri Jun 03 13:32:37 2005 -0800
@@ -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 -r fc4a6e5b5812 -r 4f802588cdfb templates/fileannotate.tmpl
--- a/templates/fileannotate.tmpl	Fri Jun 03 12:58:47 2005 -0800
+++ b/templates/fileannotate.tmpl	Fri Jun 03 13:32:37 2005 -0800
@@ -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 -r fc4a6e5b5812 -r 4f802588cdfb templates/filelogentry.tmpl
--- a/templates/filelogentry.tmpl	Fri Jun 03 12:58:47 2005 -0800
+++ b/templates/filelogentry.tmpl	Fri Jun 03 13:32:37 2005 -0800
@@ -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 -r fc4a6e5b5812 -r 4f802588cdfb templates/map
--- a/templates/map	Fri Jun 03 12:58:47 2005 -0800
+++ b/templates/map	Fri Jun 03 13:32:37 2005 -0800
@@ -16,7 +16,7 @@
 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 @@
 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>"