mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
92f6f35e7a
Summary: This diff marks **ALL** mercurial tests requiring Python 2 feature. After you fixes some tests, simply remove the `py2` feature requirement and that tests will be continuously run after your diff is landed. To bypass this feature requirement, run the tests command with `HGTEST_FORCE_PY2=1`. For example: ``` HGTEST_FORCE_PY2=1 buck test //eden/scm/tests:hg_run_tests ``` or ``` HGTEST_FORCE_PY2=1 python run-tests.py ``` ---- Basically this diff are created with the following commands: ``` $ sed -i 's/import feature\(.*\)$/import feature\1\n\nfeature.require(["py2"])/' test-*-t.py $ sed -i '1s/^/#require py2\n/' test-*.t $ ls | grep -P "^test.*(?<\!-t)\.py$" > list && vim -p $(cat list) # manually adding feature requires for these Python tests. ``` (Note: this ignores all push blocking failures!) ignore-conflict-markers Reviewed By: singhsrb Differential Revision: D19655148 fbshipit-source-id: 985e3ccb4010cc559049f1d89f8909bc2d9b5e20
72 lines
2.2 KiB
Perl
72 lines
2.2 KiB
Perl
#require py2
|
|
#chg-compatible
|
|
|
|
The ordering and format of case collisions detected using treemanifest is
|
|
different, so this is a different test script.
|
|
|
|
$ . "$TESTDIR/library.sh"
|
|
|
|
$ hginit master
|
|
$ cd master
|
|
$ setconfig remotefilelog.server=true
|
|
|
|
$ hgcloneshallow ssh://user@dummy/master client -q
|
|
$ cd client
|
|
$ setconfig remotefilelog.usefastdatapack=true
|
|
|
|
$ sorted() {
|
|
> "$@" > $TESTTMP/out
|
|
> local rc=$?
|
|
> sort < $TESTTMP/out
|
|
> rm -f $TESTTMP/out
|
|
> return $rc
|
|
> }
|
|
|
|
$ mkdir -p dirA/subdirA dirA/subdirB dirB
|
|
$ touch dirA/subdirA/file1 dirA/subdirA/File10 dirA/subdirB/file2 dirB/file3 file4
|
|
$ hg commit -Aqm "base"
|
|
|
|
Check basic case collisions
|
|
$ sorted hg debugcheckcasecollisions DIRA/subdira/FILE1 DIRA/SUBDIRB/file2 DIRB/FILE3
|
|
DIRA (directory for DIRA/SUBDIRB/file2) conflicts with dirA
|
|
DIRB (directory for DIRB/FILE3) conflicts with dirB
|
|
[1]
|
|
$ sorted hg debugcheckcasecollisions dirA/subdirA/FILE1 dirA/SUBDIRB/file2 dirB/FILE3
|
|
dirA/SUBDIRB (directory for dirA/SUBDIRB/file2) conflicts with dirA/subdirB
|
|
dirA/subdirA/FILE1 conflicts with dirA/subdirA/file1
|
|
dirB/FILE3 conflicts with dirB/file3
|
|
[1]
|
|
|
|
Check a dir that collides with a file
|
|
$ hg debugcheckcasecollisions FILE4/foo
|
|
FILE4 (directory for FILE4/foo) conflicts with file4
|
|
[1]
|
|
|
|
Check a file that collides with a dir
|
|
$ hg debugcheckcasecollisions DIRb
|
|
DIRb conflicts with dirB
|
|
[1]
|
|
|
|
Check self-conflicts
|
|
$ hg debugcheckcasecollisions newdir/newfile NEWdir/newfile newdir/NEWFILE
|
|
NEWdir/newfile conflicts with newdir/newfile
|
|
NEWdir (directory for NEWdir/newfile) conflicts with newdir (directory for newdir/newfile)
|
|
newdir/NEWFILE conflicts with newdir/newfile
|
|
[1]
|
|
|
|
Check against a particular revision
|
|
$ hg debugcheckcasecollisions -r 0 FILE4
|
|
FILE4 conflicts with file4
|
|
[1]
|
|
|
|
#if no-icasefs
|
|
Check case collision on top of the commit which introduces it
|
|
(this is how this command is used: it runs from the hook on top of the commit
|
|
being checked, and it gets passed a list of file adds)
|
|
$ touch dirA/subdirA/file10
|
|
$ hg commit -Aqm new
|
|
$ hg debugcheckcasecollisions dirA/subdirA/file10
|
|
dirA/subdirA/file10 conflicts with dirA/subdirA/File10
|
|
[1]
|
|
#endif
|