tests: change some #ifs to #requires

tests/test-check-code-hg.t

@@ -1,17 +1,15 b''
-#if test-repo
+#require test-repo
 
   $ check_code="$TESTDIR"/../contrib/check-code.py
   $ cd "$TESTDIR"/..
 
 New errors are not allowed. Warnings are strongly discouraged.
 (The writing "no-che?k-code" is for not skipping this file when checking.)
 
   $ hg locate | sed 's-\\-/-g' |
   >   xargs "$check_code" --warnings --per-file=0 || false
   Skipping hgext/zeroconf/Zeroconf.py it has no-che?k-code (glob)
   Skipping i18n/polib.py it has no-che?k-code (glob)
   Skipping mercurial/httpclient/__init__.py it has no-che?k-code (glob)
   Skipping mercurial/httpclient/_readers.py it has no-che?k-code (glob)
   Skipping mercurial/httpclient/socketutil.py it has no-che?k-code (glob)
-
-#endif

tests/test-check-pyflakes.t

@@ -1,22 +1,20 b''
-#if test-repo pyflakes
+#require test-repo pyflakes
 
   $ cd "`dirname "$TESTDIR"`"
 
 run pyflakes on all tracked files ending in .py or without a file ending
 (skipping binary file random-seed)
 
   $ hg locate 'set:**.py or grep("^!#.*python")' 2>/dev/null \
   > | xargs pyflakes 2>/dev/null | "$TESTDIR/filterpyflakes.py"
   contrib/win32/hgwebdir_wsgi.py:*: 'win32traceutil' imported but unused (glob)
   setup.py:*: 'sha' imported but unused (glob)
   setup.py:*: 'zlib' imported but unused (glob)
   setup.py:*: 'bz2' imported but unused (glob)
   setup.py:*: 'py2exe' imported but unused (glob)
   tests/hghave.py:*: '_lsprof' imported but unused (glob)
   tests/hghave.py:*: 'publish_cmdline' imported but unused (glob)
   tests/hghave.py:*: 'pygments' imported but unused (glob)
   tests/hghave.py:*: 'ssl' imported but unused (glob)
   contrib/win32/hgwebdir_wsgi.py:93: 'from isapi.install import *' used; unable to detect undefined names (glob)
   tests/filterpyflakes.py:58: undefined name 'undefinedname'
-  
-#endif

tests/test-lock-badness.t

@@ -1,42 +1,41 b''
-#if unix-permissions no-root no-windows
+#require unix-permissions no-root no-windows
 
 Prepare
 
   $ hg init a
   $ echo a > a/a
   $ hg -R a ci -A -m a
   adding a
 
   $ hg clone a b
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 One process waiting for another
 
   $ cat > hooks.py << EOF
   > import time
   > def sleepone(**x): time.sleep(1)
   > def sleephalf(**x): time.sleep(0.5)
   > EOF
   $ echo b > b/b
   $ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout &
   $ hg -R b up -q --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf"
   waiting for lock on working directory of b held by '*:*' (glob)
   got lock after ? seconds (glob)
   warning: ignoring unknown working parent d2ae7f538514!
   $ wait
   $ cat stdout
   adding b
 
 Pushing to a local read-only repo that can't be locked
 
   $ chmod 100 a/.hg/store
 
   $ hg -R b push a
   pushing to a
   searching for changes
   abort: could not lock repository a: Permission denied
   [255]
 
   $ chmod 700 a/.hg/store
-#endif

tests/test-permissions.t

@@ -1,74 +1,72 b''
-#if unix-permissions no-root
+#require unix-permissions no-root
 
   $ hg init t
   $ cd t
 
   $ echo foo > a
   $ hg add a
 
   $ hg commit -m "1"
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 1 changesets, 1 total revisions
 
   $ chmod -r .hg/store/data/a.i
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i
   [255]
 
   $ chmod +r .hg/store/data/a.i
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 1 changesets, 1 total revisions
 
   $ chmod -w .hg/store/data/a.i
 
   $ echo barber > a
   $ hg commit -m "2"
   trouble committing a!
   abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i
   [255]
 
   $ chmod -w .
 
   $ hg diff --nodates
   diff -r 2a18120dc1c9 a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -foo
   +barber
 
   $ chmod +w .
 
   $ chmod +w .hg/store/data/a.i
   $ mkdir dir
   $ touch dir/a
   $ hg status
   M a
   ? dir/a
   $ chmod -rx dir
   $ hg status
   dir: Permission denied
   M a
 
 Reenable perm to allow deletion:
 
   $ chmod +rx dir
 
   $ cd ..
-
-#endif

tests/test-pull-permission.t

@@ -1,34 +1,32 b''
-#if unix-permissions no-root
+#require unix-permissions no-root
 
   $ hg init a
   $ cd a
   $ echo foo > b
   $ hg add b
   $ hg ci -m "b"
 
   $ chmod -w .hg/store
 
   $ cd ..
 
   $ hg clone a b
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ chmod +w a/.hg/store # let test clean up
 
   $ cd b
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 1 changesets, 1 total revisions
 
   $ cd ..
-
-#endif

tests/test-repair-strip.t

@@ -1,134 +1,132 b''
-#if unix-permissions no-root
+#require unix-permissions no-root
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=">> $HGRCPATH
 
   $ teststrip() {
   >   hg -q up -C $1
   >   echo % before update $1, strip $2
   >   hg parents
   >   chmod -$3 $4
   >   hg strip $2 2>&1 | sed 's/\(bundle\).*/\1/' | sed 's/Permission denied.*\.hg\/store\/\(.*\)/Permission denied \.hg\/store\/\1/'
   >   echo % after update $1, strip $2
   >   chmod +$3 $4
   >   hg verify
   >   echo % journal contents
   >   if [ -f .hg/store/journal ]; then
   >       sed -e 's/\.i[^\n]*/\.i/' .hg/store/journal
   >   else
   >       echo "(no journal)"
   >   fi
   >   ls .hg/store/journal >/dev/null 2>&1 && hg recover
   >   ls .hg/strip-backup/* >/dev/null 2>&1 && hg unbundle -q .hg/strip-backup/*
   >   rm -rf .hg/strip-backup
   > }
 
   $ hg init test
   $ cd test
   $ echo a > a
   $ hg -q ci -m "a" -A
   $ echo b > b
   $ hg -q ci -m "b" -A
   $ echo b2 >> b
   $ hg -q ci -m "b2" -A
   $ echo c > c
   $ hg -q ci -m "c" -A
   $ teststrip 0 2 w .hg/store/data/b.i
   % before update 0, strip 2
   changeset:   0:cb9a9f314b8b
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
   saved backup bundle
   transaction abort!
   failed to truncate data/b.i
   rollback failed - please run hg recover
   strip failed, full bundle
   abort: Permission denied .hg/store/data/b.i
   % after update 0, strip 2
   abandoned transaction found - run hg recover
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
    b@?: rev 1 points to nonexistent changeset 2
    (expected 1)
    b@?: 736c29771fba not in manifests
   warning: orphan revlog 'data/c.i'
   2 files, 2 changesets, 3 total revisions
   2 warnings encountered!
   2 integrity errors encountered!
   % journal contents
   00changelog.i
   00manifest.i
   data/b.i
   data/c.i
   rolling back interrupted transaction
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 2 changesets, 2 total revisions
   $ teststrip 0 2 r .hg/store/data/b.i
   % before update 0, strip 2
   changeset:   0:cb9a9f314b8b
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
   abort: Permission denied .hg/store/data/b.i
   % after update 0, strip 2
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   3 files, 4 changesets, 4 total revisions
   % journal contents
   (no journal)
   $ teststrip 0 2 w .hg/store/00manifest.i
   % before update 0, strip 2
   changeset:   0:cb9a9f314b8b
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
   saved backup bundle
   transaction abort!
   failed to truncate 00manifest.i
   rollback failed - please run hg recover
   strip failed, full bundle
   abort: Permission denied .hg/store/00manifest.i
   % after update 0, strip 2
   abandoned transaction found - run hg recover
   checking changesets
   checking manifests
    manifest@?: rev 2 points to nonexistent changeset 2
    manifest@?: 3362547cdf64 not in changesets
    manifest@?: rev 3 points to nonexistent changeset 3
    manifest@?: 265a85892ecb not in changesets
   crosschecking files in changesets and manifests
    c@3: in manifest but not in changeset
   checking files
    b@?: rev 1 points to nonexistent changeset 2
    (expected 1)
    c@?: rev 0 points to nonexistent changeset 3
   3 files, 2 changesets, 4 total revisions
   1 warnings encountered!
   7 integrity errors encountered!
   (first damaged changeset appears to be 3)
   % journal contents
   00changelog.i
   00manifest.i
   data/b.i
   data/c.i
   rolling back interrupted transaction
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 2 changesets, 2 total revisions
 
   $ cd ..
-
-#endif