##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: unify test-eol-add
Matt Mackall -
r12421:0ae7cad6 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,73 +1,125 b''
1 #!/bin/sh
1 Test adding .hgeol
2
3 cat > $HGRCPATH <<EOF
4 [diff]
5 git = 1
6 EOF
7
8 seteol () {
9 if [ $1 = "LF" ]; then
10 EOL='\n'
11 else
12 EOL='\r\n'
13 fi
14 }
15
16 makerepo () {
17 echo
18 echo "# ==== setup repository ===="
19 echo '% hg init'
20 hg init repo
21 cd repo
22
23 printf "first\nsecond\nthird\n" > a.txt
24 hg commit -d '100 0' --addremove -m 'LF commit'
25 cd ..
26 }
27
28 dotest () {
29 seteol $1
30
31 echo
32 echo "% hg clone repo repo-$1"
33 hg clone repo repo-$1
34 cd repo-$1
35
2
36 cat > .hg/hgrc <<EOF
3 $ cat > $HGRCPATH <<EOF
37 [extensions]
4 > [diff]
38 eol =
5 > git = 1
39
6 > EOF
40 [eol]
7 $ seteol () {
41 native = LF
8 > if [ $1 = "LF" ]; then
42 EOF
9 > EOL='\n'
43
10 > else
44 cat > .hgeol <<EOF
11 > EOL='\r\n'
45 [patterns]
12 > fi
46 **.txt = native
13 > }
47
14 $ makerepo () {
48 [repository]
15 > echo
49 native = $1
16 > echo "# ==== setup repository ===="
50 EOF
17 > echo '% hg init'
51
18 > hg init repo
52 echo '% hg add .hgeol'
19 > cd repo
53 hg add .hgeol
20 > printf "first\nsecond\nthird\n" > a.txt
54 echo '% hg status'
21 > hg commit -d '100 0' --addremove -m 'LF commit'
55 hg status
22 > cd ..
56
23 > }
57 echo '% hg commit'
24 $ dotest () {
58 hg commit -d '200 0' -m 'Added .hgeol file'
25 > seteol $1
59
26 > echo
60 echo '% hg status'
27 > echo "% hg clone repo repo-$1"
61 hg status
28 > hg clone repo repo-$1
62
29 > cd repo-$1
63 echo '% hg tip -p'
30 > cat > .hg/hgrc <<EOF
64 hg tip -p | python $TESTDIR/printrepr.py
31 > [extensions]
65
32 > eol =
66 cd ..
33 > [eol]
67 rm -r repo-$1
34 > native = LF
68 }
35 > EOF
69
36 > cat > .hgeol <<EOF
70 makerepo
37 > [patterns]
71 dotest LF
38 > **.txt = native
72 dotest CRLF
39 > [repository]
73 rm -r repo
40 > native = $1
41 > EOF
42 > echo '% hg add .hgeol'
43 > hg add .hgeol
44 > echo '% hg status'
45 > hg status
46 > echo '% hg commit'
47 > hg commit -d '200 0' -m 'Added .hgeol file'
48 > echo '% hg status'
49 > hg status
50 > echo '% hg tip -p'
51 > hg tip -p | python $TESTDIR/printrepr.py
52 > cd ..
53 > rm -r repo-$1
54 > }
55 $ makerepo
56
57 # ==== setup repository ====
58 % hg init
59 adding a.txt
60 $ dotest LF
61
62 % hg clone repo repo-LF
63 updating to branch default
64 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
65 % hg add .hgeol
66 % hg status
67 A .hgeol
68 % hg commit
69 % hg status
70 % hg tip -p
71 changeset: 1:33503edb53b0
72 tag: tip
73 user: test
74 date: Thu Jan 01 00:03:20 1970 +0000
75 summary: Added .hgeol file
76
77 diff --git a/.hgeol b/.hgeol
78 new file mode 100644
79 --- /dev/null
80 +++ b/.hgeol
81 @@ -0,0 +1,4 @@
82 +[patterns]
83 +**.txt = native
84 +[repository]
85 +native = LF
86
87 $ dotest CRLF
88
89 % hg clone repo repo-CRLF
90 updating to branch default
91 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
92 % hg add .hgeol
93 % hg status
94 M a.txt
95 A .hgeol
96 % hg commit
97 % hg status
98 % hg tip -p
99 changeset: 1:6e64eaa9eb23
100 tag: tip
101 user: test
102 date: Thu Jan 01 00:03:20 1970 +0000
103 summary: Added .hgeol file
104
105 diff --git a/.hgeol b/.hgeol
106 new file mode 100644
107 --- /dev/null
108 +++ b/.hgeol
109 @@ -0,0 +1,4 @@
110 +[patterns]
111 +**.txt = native
112 +[repository]
113 +native = CRLF
114 diff --git a/a.txt b/a.txt
115 --- a/a.txt
116 +++ b/a.txt
117 @@ -1,3 +1,3 @@
118 -first
119 -second
120 -third
121 +first\r
122 +second\r
123 +third\r
124
125 $ rm -r repo
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now