check-code: fix check for trailing whitespace on empty lines
It seems like the intention with
c7d23b4ca4ba was to catch lines with only
one whitespace too.
--- a/contrib/check-code.py Wed Aug 08 18:10:16 2012 +0200
+++ b/contrib/check-code.py Wed Aug 08 18:10:30 2012 +0200
@@ -91,7 +91,7 @@
uprefix = r"^ \$ "
utestpats = [
[
- (r'^(\S| \$ ).*(\S[ \t]+|^[ \t]+)\n', "trailing whitespace on non-output"),
+ (r'^(\S.*|| \$ .*)[ \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"),
--- a/tests/test-basic.t Wed Aug 08 18:10:16 2012 +0200
+++ b/tests/test-basic.t Wed Aug 08 18:10:30 2012 +0200
@@ -33,7 +33,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg identify -n
0
-
+
Poke around at hashes:
--- a/tests/test-bookmarks-pushpull.t Wed Aug 08 18:10:16 2012 +0200
+++ b/tests/test-bookmarks-pushpull.t Wed Aug 08 18:10:30 2012 +0200
@@ -260,7 +260,7 @@
Z 2:0d2164f0ce0d
foo -1:000000000000
foobar 1:9b140be10808
-
+
$ cd ..
Pushing a bookmark should only push the changes required by that
--- a/tests/test-diffstat.t Wed Aug 08 18:10:16 2012 +0200
+++ b/tests/test-diffstat.t Wed Aug 08 18:10:30 2012 +0200
@@ -68,5 +68,5 @@
$ hg diff --stat --git
file with spaces | Bin
1 files changed, 0 insertions(+), 0 deletions(-)
-
+
$ cd ..
--- a/tests/test-encoding.t Wed Aug 08 18:10:16 2012 +0200
+++ b/tests/test-encoding.t Wed Aug 08 18:10:30 2012 +0200
@@ -248,5 +248,5 @@
$ HGENCODING=latin-1 hg up `cat latin-1-tag`
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-
+
$ cd ..
--- a/tests/test-largefiles.t Wed Aug 08 18:10:16 2012 +0200
+++ b/tests/test-largefiles.t Wed Aug 08 18:10:30 2012 +0200
@@ -80,7 +80,7 @@
$ rm sub/unknown
Remove both largefiles and normal files.
-
+
$ hg remove normal1 large1
$ hg status large1
R large1
--- a/tests/test-rebase-bookmarks.t Wed Aug 08 18:10:16 2012 +0200
+++ b/tests/test-rebase-bookmarks.t Wed Aug 08 18:10:30 2012 +0200
@@ -23,7 +23,7 @@
adding b
$ hg book 'X'
$ hg book 'Y'
-
+
$ echo c > c
$ hg ci -Am C
adding c
@@ -47,7 +47,7 @@
|/
o 0: 'A' bookmarks:
-
+
Move only rebased bookmarks
$ cd ..
--- a/tests/test-subrepo-deep-nested-change.t Wed Aug 08 18:10:16 2012 +0200
+++ b/tests/test-subrepo-deep-nested-change.t Wed Aug 08 18:10:30 2012 +0200
@@ -100,7 +100,7 @@
revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487
Check that deep archiving works
-
+
$ cd cloned
$ echo 'test' > sub1/sub2/test.txt
$ hg --config extensions.largefiles=! add sub1/sub2/test.txt