[PATCH 1 of 3 stable] check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich
mads at kiilerich.com
Wed Aug 8 11:11:50 CDT 2012
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1344442216 -7200
# Branch stable
# Node ID 511cc5665914ce79f46ed49ef3d9b6390f9ff224
# Parent 96189d60d810317ef8f707ec3ab123a9beb288cd
check-code: fix check for trailing whitespace on sh command lines
The $ has been without necessary escaping since introduced in c7d23b4ca4ba.
diff --git a/contrib/check-code.py b/contrib/check-code.py
--- a/contrib/check-code.py
+++ b/contrib/check-code.py
@@ -91,7 +91,7 @@
uprefix = r"^ \$ "
utestpats = [
[
- (r'^(\S| $ ).*(\S[ \t]+|^[ \t]+)\n', "trailing whitespace on non-output"),
+ (r'^(\S| \$ ).*(\S[ \t]+|^[ \t]+)\n', "trailing whitespace on non-output"),
(uprefix + r'.*\|\s*sed[^|>\n]*\n',
"use regex test output patterns instead of sed"),
(uprefix + r'(true|exit 0)', "explicit zero exit unnecessary"),
diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -210,7 +210,7 @@
$ cat ../hg.pid >> $DAEMON_PIDS
$ cd ../a
- $ hg debugpushkey http://localhost:$HGPORT/ namespaces
+ $ hg debugpushkey http://localhost:$HGPORT/ namespaces
bookmarks
phases
namespaces
diff --git a/tests/test-clone.t b/tests/test-clone.t
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -533,7 +533,7 @@
destination directory not empty
- $ mkdir a
+ $ mkdir a
$ echo stuff > a/a
$ hg clone q a
abort: destination 'a' is not empty
diff --git a/tests/test-command-template.t b/tests/test-command-template.t
--- a/tests/test-command-template.t
+++ b/tests/test-command-template.t
@@ -1245,7 +1245,7 @@
$ hg add a
$ hg commit -m future -d "`cat a`"
- $ hg log -l1 --template '{date|age}\n'
+ $ hg log -l1 --template '{date|age}\n'
7 years from now
Error on syntax:
diff --git a/tests/test-convert-cvsnt-mergepoints.t b/tests/test-convert-cvsnt-mergepoints.t
--- a/tests/test-convert-cvsnt-mergepoints.t
+++ b/tests/test-convert-cvsnt-mergepoints.t
@@ -43,7 +43,7 @@
$ cvscall -Q add foo
$ cd foo
$ echo foo > foo.txt
- $ cvscall -Q add foo.txt
+ $ cvscall -Q add foo.txt
$ cvsci -m "add foo.txt" foo.txt
$ cd ../..
$ rm -rf cvsworktmp
diff --git a/tests/test-convert.t b/tests/test-convert.t
--- a/tests/test-convert.t
+++ b/tests/test-convert.t
@@ -399,7 +399,7 @@
test revset converted() lookup
- $ hg --config convert.hg.saverev=True convert a c
+ $ hg --config convert.hg.saverev=True convert a c
initializing destination c repository
scanning source...
sorting...
diff --git a/tests/test-export.t b/tests/test-export.t
--- a/tests/test-export.t
+++ b/tests/test-export.t
@@ -124,7 +124,7 @@
Checking if only alphanumeric characters are used in the file name (%m option):
$ echo "line" >> foo
- $ hg commit -m " !\"#$%&(,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_\`abcdefghijklmnopqrstuvwxyz{|}~"
+ $ hg commit -m " !\"#$%&(,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_\`abcdefghijklmnopqrstuvwxyz{|}~"
$ hg export -v -o %m.patch tip
exporting patch:
____________0123456789_______ABCDEFGHIJKLMNOPQRSTUVWXYZ______abcdefghijklmnopqrstuvwxyz____.patch
diff --git a/tests/test-http.t b/tests/test-http.t
--- a/tests/test-http.t
+++ b/tests/test-http.t
@@ -138,24 +138,24 @@
> --config server.preferuncompressed=True
$ cat pid >> $DAEMON_PIDS
- $ hg id http://localhost:$HGPORT2/
+ $ hg id http://localhost:$HGPORT2/
abort: http authorization required
[255]
- $ hg id http://user@localhost:$HGPORT2/
+ $ hg id http://user@localhost:$HGPORT2/
abort: http authorization required
[255]
$ hg id http://user:pass@localhost:$HGPORT2/
5fed3813f7f5
- $ echo '[auth]' >> .hg/hgrc
+ $ echo '[auth]' >> .hg/hgrc
$ echo 'l.schemes=http' >> .hg/hgrc
$ echo 'l.prefix=lo' >> .hg/hgrc
$ echo 'l.username=user' >> .hg/hgrc
$ echo 'l.password=pass' >> .hg/hgrc
- $ hg id http://localhost:$HGPORT2/
+ $ hg id http://localhost:$HGPORT2/
5fed3813f7f5
- $ hg id http://localhost:$HGPORT2/
+ $ hg id http://localhost:$HGPORT2/
5fed3813f7f5
- $ hg id http://user@localhost:$HGPORT2/
+ $ hg id http://user@localhost:$HGPORT2/
5fed3813f7f5
$ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
streaming all changes
@@ -164,7 +164,7 @@
updating to branch default
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg id http://user2@localhost:$HGPORT2/
+ $ hg id http://user2@localhost:$HGPORT2/
abort: http authorization required
[255]
$ hg id http://user:pass2@localhost:$HGPORT2/
diff --git a/tests/test-import-git.t b/tests/test-import-git.t
--- a/tests/test-import-git.t
+++ b/tests/test-import-git.t
@@ -384,7 +384,7 @@
b
\x00 (no-eol) (esc)
- $ hg st --copies --change .
+ $ hg st --copies --change .
A binary2
text2
R text2
diff --git a/tests/test-inotify-issue1371.t b/tests/test-inotify-issue1371.t
--- a/tests/test-inotify-issue1371.t
+++ b/tests/test-inotify-issue1371.t
@@ -1,6 +1,6 @@
$ "$TESTDIR/hghave" inotify || exit 80
- $ hg init
+ $ hg init
$ touch a b c d e f
$ echo "[extensions]" >> $HGRCPATH
$ echo "inotify=" >> $HGRCPATH
@@ -41,4 +41,4 @@
Are we able to kill the service? if not, the service died on some error
- $ kill `cat hg.pid`
+ $ kill `cat hg.pid`
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -998,7 +998,7 @@
$ echo '$Id$' > m
$ hg add m
- $ hg commit -m 4kw
+ $ hg commit -m 4kw
$ echo foo >> m
$ hg commit -m 5foo
diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
--- a/tests/test-largefiles.t
+++ b/tests/test-largefiles.t
@@ -212,7 +212,7 @@
$ hg archive -r 3 ../archive3
$ hg archive -r 4 ../archive4
$ cd ../archive0
- $ cat normal1
+ $ cat normal1
normal1
$ cat large1
large1
@@ -632,7 +632,7 @@
Old revisions of a clone have correct largefiles content (this also
tests update).
- $ hg update -r 1
+ $ hg update -r 1
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
1 largefiles updated, 0 removed
@@ -785,7 +785,7 @@
Rollback on largefiles.
- $ echo large4-modified-again > sub/large4
+ $ echo large4-modified-again > sub/large4
$ hg commit -m "Modify large4 again"
Invoking status precommit hook
M sub/large4
@@ -815,7 +815,7 @@
"update --clean" leaves correct largefiles in working copy.
- $ hg update --clean
+ $ hg update --clean
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
1 largefiles updated, 0 removed
@@ -1019,7 +1019,7 @@
getting changed largefiles
3 largefiles updated, 0 removed
$ cd g
- $ hg transplant -s ../d 598410d3eb9a
+ $ hg transplant -s ../d 598410d3eb9a
searching for changes
searching for changes
adding changesets
diff --git a/tests/test-mv-cp-st-diff.t b/tests/test-mv-cp-st-diff.t
--- a/tests/test-mv-cp-st-diff.t
+++ b/tests/test-mv-cp-st-diff.t
@@ -187,7 +187,7 @@
+y1
- $ tb "add a a1" "add a a2" "hg cp a b" "copy in working dir"
+ $ tb "add a a1" "add a a2" "hg cp a b" "copy in working dir"
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
diff --git a/tests/test-pull-branch.t b/tests/test-pull-branch.t
--- a/tests/test-pull-branch.t
+++ b/tests/test-pull-branch.t
@@ -142,7 +142,7 @@
$ hg branch branchC
marked working directory as branch branchC
(branches are permanent and global, did you want a bookmark?)
- $ echo b1 > bar
+ $ echo b1 > bar
$ hg ci -Am "commit on branchC on tt"
adding bar
@@ -151,7 +151,7 @@
$ cd ../t
$ hg up -C default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ echo a1 > bar
+ $ echo a1 > bar
$ hg ci -Am "commit on default on t"
adding bar
diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t
--- a/tests/test-rebase-bookmarks.t
+++ b/tests/test-rebase-bookmarks.t
@@ -38,7 +38,7 @@
$ hg book W
- $ hg tglog
+ $ hg tglog
@ 3: 'D' bookmarks: W
|
| o 2: 'C' bookmarks: Y Z
@@ -59,7 +59,7 @@
$ hg rebase -s Y -d 3
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
- $ hg tglog
+ $ hg tglog
@ 3: 'C' bookmarks: Y Z
|
o 2: 'D' bookmarks: W
@@ -79,7 +79,7 @@
$ hg rebase -s 1 -d 3
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
- $ hg tglog
+ $ hg tglog
@ 3: 'C' bookmarks: Y Z
|
o 2: 'B' bookmarks: X
diff --git a/tests/test-rebase-cache.t b/tests/test-rebase-cache.t
--- a/tests/test-rebase-cache.t
+++ b/tests/test-rebase-cache.t
@@ -73,7 +73,7 @@
$ hg clone -q -u . a a1
$ cd a1
- $ hg tglog
+ $ hg tglog
@ 8: 'F' branch3
|
o 7: 'branch3' branch3
@@ -120,7 +120,7 @@
2: 'B' branch1
0: 'A'
- $ hg tglog
+ $ hg tglog
@ 8: 'E' branch3
|
o 7: 'D' branch3
@@ -244,7 +244,7 @@
2: 'B' branch1
0: 'A'
- $ hg tglog
+ $ hg tglog
@ 7: 'F' branch2
|
o 6: 'E' branch2
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -69,7 +69,7 @@
Try to continue without solving the conflict:
- $ hg rebase --continue
+ $ hg rebase --continue
abort: unresolved merge conflicts (see hg help resolve)
[255]
diff --git a/tests/test-rebase-mq-skip.t b/tests/test-rebase-mq-skip.t
--- a/tests/test-rebase-mq-skip.t
+++ b/tests/test-rebase-mq-skip.t
@@ -39,7 +39,7 @@
$ hg add p1
$ hg qref -m P1
- $ hg export qtip > p1.patch
+ $ hg export qtip > p1.patch
$ hg up -q -C 1
diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t
--- a/tests/test-run-tests.t
+++ b/tests/test-run-tests.t
@@ -95,5 +95,5 @@
Exit code:
- $ (exit 1)
+ $ (exit 1)
[1]
diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -446,7 +446,7 @@
$ git rev-parse HEAD
da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7
$ cd ..
- $ hg update --clean tip > /dev/null 2>&1
+ $ hg update --clean tip > /dev/null 2>&1
Sticky subrepository, revision updates
$ hg id -n
diff --git a/tests/test-subrepo-missing.t b/tests/test-subrepo-missing.t
--- a/tests/test-subrepo-missing.t
+++ b/tests/test-subrepo-missing.t
@@ -60,7 +60,7 @@
warning: subrepo spec file .hgsub not found
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm .hgsubstate
- $ hg up 0
+ $ hg up 0
remote changed .hgsubstate which local deleted
use (c)hanged version or leave (d)eleted? c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -730,7 +730,7 @@
925c17564ef8 tip
$ hg -R s id
12a213df6fa9 tip
- $ hg -R t id
+ $ hg -R t id
52c0adc0515a tip
$ hg update 11
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -738,7 +738,7 @@
365661e5936a
$ hg -R s id
fc627a69481f
- $ hg -R t id
+ $ hg -R t id
e95bcfa18a35
Sticky subrepositorys, file changes
@@ -750,7 +750,7 @@
365661e5936a+
$ hg -R s id
fc627a69481f+
- $ hg -R t id
+ $ hg -R t id
e95bcfa18a35+
$ hg update tip
subrepository sources for s differ
@@ -764,7 +764,7 @@
925c17564ef8+ tip
$ hg -R s id
fc627a69481f+
- $ hg -R t id
+ $ hg -R t id
e95bcfa18a35+
$ hg update --clean tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -774,7 +774,7 @@
925c17564ef8 tip
$ hg -R s id
12a213df6fa9 tip
- $ hg -R t id
+ $ hg -R t id
52c0adc0515a tip
$ cd s
$ hg update -r -2
@@ -792,7 +792,7 @@
e45c8b14af55+
$ hg -R s id
02dcf1d70411
- $ hg -R t id
+ $ hg -R t id
7af322bc1198
Sticky subrepository, file changes and revision updates
@@ -804,7 +804,7 @@
e45c8b14af55+
$ hg -R s id
02dcf1d70411+
- $ hg -R t id
+ $ hg -R t id
7af322bc1198+
$ hg update tip
subrepository sources for s differ
@@ -818,7 +818,7 @@
925c17564ef8+ tip
$ hg -R s id
02dcf1d70411+
- $ hg -R t id
+ $ hg -R t id
7af322bc1198+
Sticky repository, update --clean
@@ -828,7 +828,7 @@
925c17564ef8 tip
$ hg -R s id
12a213df6fa9 tip
- $ hg -R t id
+ $ hg -R t id
52c0adc0515a tip
Test subrepo already at intended revision:
@@ -843,7 +843,7 @@
11+
$ hg -R s id
fc627a69481f
- $ hg -R t id
+ $ hg -R t id
e95bcfa18a35
Test that removing .hgsubstate doesn't break anything:
diff --git a/tests/test-tags.t b/tests/test-tags.t
--- a/tests/test-tags.t
+++ b/tests/test-tags.t
@@ -137,7 +137,7 @@
$ echo >> .hgtags
$ echo "foo bar" >> .hgtags
$ echo "a5a5 invalid" >> .hg/localtags
- $ cat .hgtags
+ $ cat .hgtags
acb14030fe0a21b60322c440ad2d20cf7685a376 first
spam
diff --git a/tests/test-treediscovery-legacy.t b/tests/test-treediscovery-legacy.t
--- a/tests/test-treediscovery-legacy.t
+++ b/tests/test-treediscovery-legacy.t
@@ -330,7 +330,7 @@
$ hg ci -Am A
adding A
$ cd ..
- $ hg clone rlocal rremote
+ $ hg clone rlocal rremote
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd rlocal
@@ -341,7 +341,7 @@
$ tstart rremote
$ cd rlocal
- $ hg incoming $remote
+ $ hg incoming $remote
comparing with http://localhost:$HGPORT/
searching for changes
no changes found
More information about the Mercurial-devel
mailing list