diff --git a/mercurial/ui.py b/mercurial/ui.py index 737c66b682900d82aaca6aa0310c0defd42302af_bWVyY3VyaWFsL3VpLnB5..afe895fcc0d00db4b92ed07364a212486698288b_bWVyY3VyaWFsL3VpLnB5 100644 --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -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 --git a/templates/changelogentry.tmpl b/templates/changelogentry.tmpl index 737c66b682900d82aaca6aa0310c0defd42302af_dGVtcGxhdGVzL2NoYW5nZWxvZ2VudHJ5LnRtcGw=..afe895fcc0d00db4b92ed07364a212486698288b_dGVtcGxhdGVzL2NoYW5nZWxvZ2VudHJ5LnRtcGw= 100644 --- 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: </b></td> - <td><b>#desc|firstline|escape#</b></td</tr> + <td><b>#desc|firstline|escape#</b></td></tr> <tr> <td align="right">changeset #rev#: </td> <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr> @@ -10,7 +10,7 @@ #parent2# <tr> <td align="right">author: </td> - <td>#author#</td></tr> + <td>#author|obfuscate#</td></tr> <tr> <td align="right">date: </td> <td>#date|date#</td></tr> diff --git a/templates/fileannotate.tmpl b/templates/fileannotate.tmpl index 737c66b682900d82aaca6aa0310c0defd42302af_dGVtcGxhdGVzL2ZpbGVhbm5vdGF0ZS50bXBs..afe895fcc0d00db4b92ed07364a212486698288b_dGVtcGxhdGVzL2ZpbGVhbm5vdGF0ZS50bXBs 100644 --- 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 index 737c66b682900d82aaca6aa0310c0defd42302af_dGVtcGxhdGVzL2ZpbGVsb2dlbnRyeS50bXBs..afe895fcc0d00db4b92ed07364a212486698288b_dGVtcGxhdGVzL2ZpbGVsb2dlbnRyeS50bXBs 100644 --- 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: </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#: </td> <td><a href="?cmd=file;file=#file#;filenode=#filenode#">#filenode#</a> diff --git a/templates/map b/templates/map index 737c66b682900d82aaca6aa0310c0defd42302af_dGVtcGxhdGVzL21hcA==..afe895fcc0d00db4b92ed07364a212486698288b_dGVtcGxhdGVzL21hcA== 100644 --- a/templates/map +++ b/templates/map @@ -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>"