Mercurial > hg > gitweb
changeset 3028:ea734528ce04
merge with brendan
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 30 Aug 2006 19:58:54 +0200 |
| parents | d9b8d28c0b94 (diff) a4374f7331e4 (current diff) |
| children | eba7c78c80fe |
| files | |
| diffstat | 3 files changed, 12 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hgeditor Tue Aug 29 17:08:55 2006 -0700 +++ b/hgeditor Wed Aug 30 19:58:54 2006 +0200 @@ -41,13 +41,15 @@ cat "$1" > "$HGTMP/msg" -CHECKSUM=`md5sum "$HGTMP/msg"` +MD5=$(which md5sum 2>/dev/null) || \ + MD5=$(which md5 2>/dev/null) +[ -x "${MD5}" ] && CHECKSUM=`${MD5} "$HGTMP/msg"` if [ -s "$HGTMP/diff" ]; then $EDITOR "$HGTMP/msg" "$HGTMP/diff" || exit $? else $EDITOR "$HGTMP/msg" || exit $? fi -echo "$CHECKSUM" | md5sum -c >/dev/null 2>&1 && exit 13 +[ -x "${MD5}" ] && (echo "$CHECKSUM" | ${MD5} -c >/dev/null 2>&1 && exit 13) mv "$HGTMP/msg" "$1"
--- a/templates/map-gitweb Tue Aug 29 17:08:55 2006 -0700 +++ b/templates/map-gitweb Wed Aug 30 19:58:54 2006 +0200 @@ -19,12 +19,12 @@ filerevision = filerevision-gitweb.tmpl fileannotate = fileannotate-gitweb.tmpl filelog = filelog-gitweb.tmpl -fileline = '<div style="font-family:monospace; white-space: pre;" class="parity#parity#"><span class="linenr"> #linenumber#</span> #line|escape#</div>' -annotateline = '<tr style="font-family:monospace; white-space: pre;" class="parity#parity#"><td class="linenr" style="text-align: right;"><a href="?cs=#node|short#;style=gitweb">#author|obfuscate#@#rev#</a></td><td>#line|escape#</td></tr>' -difflineplus = '<div class="pre" style="color:#008800;">#line|escape#</div>' -difflineminus = '<div class="pre" style="color:#cc0000;">#line|escape#</div>' -difflineat = '<div class="pre" style="color:#990099;">#line|escape#</div>' -diffline = '<div class="pre">#line|escape#</div>' +fileline = '<div style="font-family:monospace" class="parity#parity#"><pre><span class="linenr"> #linenumber#</span> #line|escape#</pre></div>' +annotateline = '<tr style="font-family:monospace" class="parity#parity#"><td class="linenr" style="text-align: right;"><a href="?cs=#node|short#;style=gitweb">#author|obfuscate#@#rev#</a></td><td><pre>#line|escape#</pre></td></tr>' +difflineplus = '<div style="color:#008800;">#line|escape#</div>' +difflineminus = '<div style="color:#cc0000;">#line|escape#</div>' +difflineat = '<div style="color:#990099;">#line|escape#</div>' +diffline = '<div>#line|escape#</div>' changelogparent = '<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#;style=gitweb">#node|short#</a></td></tr>' changesetparent = '<tr><td>parent</td><td style="font-family:monospace"><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb">#node|short#</a></td></tr>' filerevparent = '<tr><td class="metatag">parent:</td><td><a href="?cmd=file;file=#file|urlescape#;filenode=#node#;style=gitweb">#node|short#</a></td></tr>' @@ -37,7 +37,7 @@ fileannotatechild = '<tr><td class="metatag">child:</td><td><a href="?cmd=annotate;file=#file|urlescape#;filenode=#node#;style=gitweb">#node|short#</a></td></tr>' tags = tags-gitweb.tmpl tagentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#tag|escape#</b></a></td><td class="link"><a href="?cmd=changeset;node=#node|short#;style=gitweb">changeset</a> | <a href="?cmd=changelog;rev=#node|short#;style=gitweb">changelog</a> | <a href="?mf=#tagmanifest|short#;path=/;style=gitweb">manifest</a></td></tr>' -diffblock = '#lines#' +diffblock = '<pre>#lines#</pre>' changelogtag = '<tr><th class="tag">tag:</th><td class="tag">#tag|escape#</td></tr>' changesettag = '<tr><td>tag</td><td>#tag|escape#</td></tr>' filediffparent = '<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#;style=gitweb">#node|short#</a></td></tr>'