Mercurial > hg
changeset 4500:eb26f8f70364
merge with stable
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 04 Jun 2007 22:08:42 +0200 |
parents | 22ebd6ee5672 (current diff) 84ca5597a435 (diff) |
children | d6b9c3a03268 |
files | hgext/notify.py templates/gitweb/map |
diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/notify.py Mon Jun 04 00:26:53 2007 -0300 +++ b/hgext/notify.py Mon Jun 04 22:08:42 2007 +0200 @@ -92,7 +92,7 @@ deftemplates = { 'changegroup': multiple_template, - } +} class notifier(object): '''email notification class.''' @@ -211,7 +211,8 @@ msg['From'] = sender msg['Date'] = util.datestr(date=util.makedate(), - format="%a, %d %b %Y %H:%M:%S", timezone=True) + format="%a, %d %b %Y %H:%M:%S", + timezone=True) fix_subject() fix_sender() @@ -229,7 +230,7 @@ self.ui.write('\n') else: self.ui.status(_('notify: sending %d subscribers %d changes\n') % - (len(self.subs), count)) + (len(self.subs), count)) mail.sendmail(self.ui, templater.email(msg['From']), self.subs, msgtext) @@ -265,7 +266,7 @@ return if n.skipsource(source): ui.debug(_('notify: changes have source "%s" - skipping\n') % - source) + source) return node = bin(node) ui.pushbuffer()
--- a/templates/gitweb/map Mon Jun 04 00:26:53 2007 -0300 +++ b/templates/gitweb/map Mon Jun 04 22:08:42 2007 +0200 @@ -48,7 +48,7 @@ filediffchild = '<tr><td>child {rev}</td><td style="font-family:monospace"><a class="list" href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>' filelogchild = '<tr><td align="right">child #rev#: </td><td><a href="{url}file{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>' shortlog = shortlog.tmpl -shortlogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><i>#author#</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b></a></td><td class="link" nowrap><a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a></td></tr>' +shortlogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><i>#author|obfuscate#</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b></a></td><td class="link" nowrap><a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a></td></tr>' filelogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b></a></td><td class="link"><a href="{url}file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a> | <a href="{url}diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">diff</a> | <a href="{url}annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a> #rename%filelogrename#</td></tr>' archiveentry = ' | <a href="{url}archive/{node|short}{extension}">#type|escape#</a> ' indexentry = '<tr class="parity#parity#"><td><a class="list" href="#url#{sessionvars%urlparameter}"><b>#name|escape#</b></a></td><td>#description#</td><td>#contact|obfuscate#</td><td class="age">#lastchange|age# ago</td><td class="indexlinks"><a class="rss_logo" href="#url#rss-log">RSS</a> #archives%archiveentry#</td></tr>'