Mercurial > hg-stable
changeset 16016:73da3e2b185f stable
merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 29 Jan 2012 12:59:11 -0600 |
| parents | 2494a8b42dfb (current diff) f8955a7f82e6 (diff) |
| children | 2605fc990725 |
| files | |
| diffstat | 5 files changed, 4 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/check-code.py Sat Jan 28 09:05:08 2012 -0200 +++ b/contrib/check-code.py Sun Jan 29 12:59:11 2012 -0600 @@ -71,6 +71,7 @@ (r'[^>\n]>\s*\$HGRCPATH', "don't overwrite $HGRCPATH, append to it"), (r'^stop\(\)', "don't use 'stop' as a shell function name"), (r'(\[|\btest\b).*-e ', "don't use 'test -e', use 'test -f'"), + (r'^alias\b.*=', "don't use alias, use a function"), ], # warnings []
--- a/tests/test-diff-unified.t Sat Jan 28 09:05:08 2012 -0200 +++ b/tests/test-diff-unified.t Sun Jan 29 12:59:11 2012 -0600 @@ -107,17 +107,6 @@ > c3 > c4 > EOF - $ diff -U0 f1 f2 - --- f1 * (glob) - +++ f2 * (glob) - @@ -0,0 +1 @@ - +c1 - @@ -1,0 +3 @@ - +c3 - @@ -3 +4,0 @@ - -c5 - [1] - $ mv f2 f1 $ hg diff -U0 --nodates diff -r 55d8ff78db23 f1
--- a/tests/test-phases-exchange.t Sat Jan 28 09:05:08 2012 -0200 +++ b/tests/test-phases-exchange.t Sun Jan 29 12:59:11 2012 -0600 @@ -2,7 +2,7 @@ > [extensions] > graphlog= > EOF - $ alias hgph='hg log -G --template "{rev} {phase} {desc} - {node|short}\n"' + $ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; } $ mkcommit() { > echo "$1" > "$1"
--- a/tests/test-phases.t Sat Jan 28 09:05:08 2012 -0200 +++ b/tests/test-phases.t Sun Jan 29 12:59:11 2012 -0600 @@ -1,4 +1,4 @@ - $ alias hglog='hg log --template "{rev} {phaseidx} {desc}\n"' + $ hglog() { hg log --template "{rev} {phaseidx} {desc}\n" $*; } $ mkcommit() { > echo "$1" > "$1" > hg add "$1"