Mercurial > hg
changeset 4659:7a7d4937272b
Kill trailing spaces
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Thu, 21 Jun 2007 09:25:49 +0200 |
| parents | 17f5d2069551 |
| children | cfa477946181 272c0a09b203 |
| files | hgeditor mercurial/commands.py mercurial/patch.py templates/gitweb/map templates/static/style.css tests/printenv.py tests/test-annotate tests/test-dispatch tests/test-empty-file tests/test-empty-group tests/test-hgrc tests/test-hook tests/test-issue322 tests/test-issue433 tests/test-mq-qrefresh-replace-log-message tests/test-rename-merge2 tests/test-tags tests/test-up-local-change |
| diffstat | 18 files changed, 37 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/hgeditor Thu Jun 21 00:34:14 2007 -0300 +++ b/hgeditor Thu Jun 21 09:25:49 2007 +0200 @@ -42,7 +42,7 @@ cat "$1" > "$HGTMP/msg" MD5=$(which md5sum 2>/dev/null) || \ - MD5=$(which md5 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 $?
--- a/mercurial/commands.py Thu Jun 21 00:34:14 2007 -0300 +++ b/mercurial/commands.py Thu Jun 21 09:25:49 2007 +0200 @@ -2515,7 +2515,7 @@ rev_ = opts['rev'] message = opts['message'] if opts['remove']: - if not name in repo.tags(): + if not name in repo.tags(): raise util.Abort(_('tag %s does not exist') % name) rev_ = nullid if not message:
--- a/mercurial/patch.py Thu Jun 21 00:34:14 2007 -0300 +++ b/mercurial/patch.py Thu Jun 21 09:25:49 2007 +0200 @@ -303,7 +303,7 @@ # Try to be smart only if patch call was not supplied if util.needbinarypatch(): args.append('--binary') - + if not patcher: raise util.Abort(_('no patch command found in hgrc or PATH'))
--- a/templates/gitweb/map Thu Jun 21 00:34:14 2007 -0300 +++ b/templates/gitweb/map Thu Jun 21 09:25:49 2007 +0200 @@ -51,7 +51,7 @@ 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> <span class="logtags">{branches%branchtag}{tags%tagtag}</span></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>' +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>' index = index.tmpl urlparameter = '#separator##name#=#value|urlescape#' hiddenformentry = '<input type="hidden" name="#name#" value="#value|escape#" />'
--- a/templates/static/style.css Thu Jun 21 00:34:14 2007 -0300 +++ b/templates/static/style.css Thu Jun 21 09:25:49 2007 +0200 @@ -3,7 +3,7 @@ .indexlinks { white-space:nowrap; } .parity0 { background-color: #dddddd; } .parity1 { background-color: #eeeeee; } -.lineno { width: 60px; color: #aaaaaa; font-size: smaller; +.lineno { width: 60px; color: #aaaaaa; font-size: smaller; text-align: right; padding-right:1em; } .plusline { color: green; } .minusline { color: red; } @@ -46,7 +46,7 @@ .logo a { font-weight: bold; - font-size: 150%; + font-size: 150%; color: #999; }
--- a/tests/printenv.py Thu Jun 21 00:34:14 2007 -0300 +++ b/tests/printenv.py Thu Jun 21 09:25:49 2007 +0200 @@ -27,7 +27,7 @@ # variables with empty values may not exist on all platforms, filter # them now for portability sake. -env = [k for k,v in os.environ.iteritems() +env = [k for k, v in os.environ.iteritems() if k.startswith("HG_") and v] env.sort()
--- a/tests/test-annotate Thu Jun 21 00:34:14 2007 -0300 +++ b/tests/test-annotate Thu Jun 21 09:25:49 2007 +0200 @@ -78,7 +78,7 @@ hg annotate -r tip a # test issue 589 -# annotate was crashing when trying to --follow something +# annotate was crashing when trying to --follow something # like A -> B -> A echo % generate ABA rename configuration echo foo > foo
--- a/tests/test-dispatch Thu Jun 21 00:34:14 2007 -0300 +++ b/tests/test-dispatch Thu Jun 21 09:25:49 2007 +0200 @@ -22,4 +22,4 @@ hg cat exit 0 - \ No newline at end of file +
--- a/tests/test-empty-file Thu Jun 21 00:34:14 2007 -0300 +++ b/tests/test-empty-file Thu Jun 21 09:25:49 2007 +0200 @@ -18,7 +18,7 @@ hg heads hg merge 1 -# before changeset 05257fd28591, we didn't notice the +# before changeset 05257fd28591, we didn't notice the # empty file that came from rev 1. hg status hg commit -m merge -d '1000000 0'
--- a/tests/test-empty-group Thu Jun 21 00:34:14 2007 -0300 +++ b/tests/test-empty-group Thu Jun 21 09:25:49 2007 +0200 @@ -1,12 +1,12 @@ #!/bin/sh # -# A B -# -# 3 4 3 -# |\/| |\ -# |/\| | \ -# 1 2 1 2 -# \ / \ / +# A B +# +# 3 4 3 +# |\/| |\ +# |/\| | \ +# 1 2 1 2 +# \ / \ / # 0 0 # # if the result of the merge of 1 and 2
--- a/tests/test-hgrc Thu Jun 21 00:34:14 2007 -0300 +++ b/tests/test-hgrc Thu Jun 21 09:25:49 2007 +0200 @@ -4,4 +4,4 @@ cd t hg init echo "invalid" > .hg/hgrc -hg status 2>&1 |sed -e "s:/.*\(/t/.*\):...\1:" +hg status 2>&1 |sed -e "s:/.*\(/t/.*\):...\1:"
--- a/tests/test-hook Thu Jun 21 00:34:14 2007 -0300 +++ b/tests/test-hook Thu Jun 21 09:25:49 2007 +0200 @@ -40,7 +40,7 @@ # test generic hooks hg id -hg cat b +hg cat b cd ../b hg pull ../a
--- a/tests/test-issue322 Thu Jun 21 00:34:14 2007 -0300 +++ b/tests/test-issue322 Thu Jun 21 09:25:49 2007 +0200 @@ -4,17 +4,17 @@ echo % file replaced with directory hg init a -cd a -echo a > a -hg commit -Ama -rm a -mkdir a +cd a +echo a > a +hg commit -Ama +rm a +mkdir a echo a > a/a echo % should fail - would corrupt dirstate hg add a/a -cd .. +cd .. echo % directory replaced with file
--- a/tests/test-issue433 Thu Jun 21 00:34:14 2007 -0300 +++ b/tests/test-issue433 Thu Jun 21 09:25:49 2007 +0200 @@ -2,9 +2,9 @@ # http://www.selenic.com/mercurial/bts/issue433 hg init a -cd a -echo a > a -hg commit -Ama +cd a +echo a > a +hg commit -Ama hg parents -r 0 doesnotexist true
--- a/tests/test-mq-qrefresh-replace-log-message Thu Jun 21 00:34:14 2007 -0300 +++ b/tests/test-mq-qrefresh-replace-log-message Thu Jun 21 09:25:49 2007 +0200 @@ -19,7 +19,7 @@ # Testing changing message with -m echo bbbb > file -hg qrefresh -m "Second commit message" +hg qrefresh -m "Second commit message" echo ======================= echo "Should display 'Second commit message'" hg log -l1 -v | sed -n '/description/,$p' @@ -41,7 +41,7 @@ echo aaaa > file2 hg add file2 echo bbbb > file2 -(echo "Fifth commit message" +(echo "Fifth commit message" echo " This is the 5th log message" >> logfile) |\ hg qrefresh -l- echo =======================
--- a/tests/test-rename-merge2 Thu Jun 21 00:34:14 2007 -0300 +++ b/tests/test-rename-merge2 Thu Jun 21 09:25:49 2007 +0200 @@ -12,7 +12,7 @@ HGMERGE="python ../merge"; export HGMERGE # perform a test merge with possible renaming -# +# # args: # $1 = action in local branch # $2 = action in remote branch @@ -57,7 +57,7 @@ hg status -camC -X rev hg ci -m "merge" -d "0 0" - + echo "--------------" echo @@ -65,10 +65,10 @@ rm -r t } -up() { +up() { cp rev $1 hg add $1 2> /dev/null - if [ "$2" != "" ] ; then + if [ "$2" != "" ] ; then cp rev $2 hg add $2 2> /dev/null fi @@ -95,7 +95,7 @@ tm "nc a b" "up a b" " " "14 merge b no ancestor" tm "up b " "nm a b" " " "15 merge b no ancestor, remove a" tm "nc a b" "up a b" " " "16 get a, merge b no ancestor" -tm "up a b" "nc a b" " " "17 keep a, merge b no ancestor" +tm "up a b" "nc a b" " " "17 keep a, merge b no ancestor" tm "nm a b" "up a b" " " "18 merge b no ancestor" tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a" tm "up a " "um a b" " " "20 merge a and b to b, remove a"