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
130 lines
2.4 KiB
Turing
130 lines
2.4 KiB
Turing
#require py2
|
|
#chg-compatible
|
|
|
|
$ disable treemanifest
|
|
#require no-fsmonitor
|
|
|
|
Test adding .hgeol
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [diff]
|
|
> git = 1
|
|
> EOF
|
|
$ seteol () {
|
|
> if [ $1 = "LF" ]; then
|
|
> EOL='\n'
|
|
> else
|
|
> EOL='\r\n'
|
|
> fi
|
|
> }
|
|
$ makerepo () {
|
|
> echo
|
|
> echo "# ==== setup repository ===="
|
|
> echo '% hg init'
|
|
> hg init repo
|
|
> cd repo
|
|
> printf "first\nsecond\nthird\n" > a.txt
|
|
> hg commit -d '100 0' --addremove -m 'LF commit'
|
|
> cd ..
|
|
> }
|
|
$ dotest () {
|
|
> seteol $1
|
|
> echo
|
|
> echo "% hg clone repo repo-$1"
|
|
> hg clone repo repo-$1
|
|
> cd repo-$1
|
|
> cat > .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> eol =
|
|
> [eol]
|
|
> native = LF
|
|
> EOF
|
|
> cat > .hgeol <<EOF
|
|
> [patterns]
|
|
> **.txt = native
|
|
> [repository]
|
|
> native = $1
|
|
> EOF
|
|
> echo '% hg add .hgeol'
|
|
> hg add .hgeol
|
|
> echo '% hg status'
|
|
> hg status
|
|
> echo '% hg commit'
|
|
> hg commit -d '200 0' -m 'Added .hgeol file'
|
|
> echo '% hg status'
|
|
> hg status
|
|
> echo '% hg tip -p'
|
|
> hg tip -p
|
|
> cd ..
|
|
> rm -r repo-$1
|
|
> }
|
|
$ makerepo
|
|
|
|
# ==== setup repository ====
|
|
% hg init
|
|
adding a.txt
|
|
$ dotest LF
|
|
|
|
% hg clone repo repo-LF
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
% hg add .hgeol
|
|
% hg status
|
|
A .hgeol
|
|
% hg commit
|
|
% hg status
|
|
% hg tip -p
|
|
changeset: 1:33503edb53b0
|
|
user: test
|
|
date: Thu Jan 01 00:03:20 1970 +0000
|
|
summary: Added .hgeol file
|
|
|
|
diff --git a/.hgeol b/.hgeol
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/.hgeol
|
|
@@ -0,0 +1,4 @@
|
|
+[patterns]
|
|
+**.txt = native
|
|
+[repository]
|
|
+native = LF
|
|
|
|
$ dotest CRLF
|
|
|
|
% hg clone repo repo-CRLF
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
% hg add .hgeol
|
|
% hg status
|
|
M a.txt
|
|
A .hgeol
|
|
% hg commit
|
|
% hg status
|
|
% hg tip -p
|
|
changeset: 1:6e64eaa9eb23
|
|
user: test
|
|
date: Thu Jan 01 00:03:20 1970 +0000
|
|
summary: Added .hgeol file
|
|
|
|
diff --git a/.hgeol b/.hgeol
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/.hgeol
|
|
@@ -0,0 +1,4 @@
|
|
+[patterns]
|
|
+**.txt = native
|
|
+[repository]
|
|
+native = CRLF
|
|
diff --git a/a.txt b/a.txt
|
|
--- a/a.txt
|
|
+++ b/a.txt
|
|
@@ -1,3 +1,3 @@
|
|
-first
|
|
-second
|
|
-third
|
|
+first\r (esc)
|
|
+second\r (esc)
|
|
+third\r (esc)
|
|
|
|
$ rm -r repo
|