Show More
| @@ -1,73 +1,125 b'' | |||
|
|
1 | #!/bin/sh | |
|
|
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 | |
|
|
1 | Test adding .hgeol | |
|
|
35 | 2 | |
|
|
36 |
|
|
|
|
37 | [extensions] | |
|
|
38 | eol = | |
|
|
39 | ||
|
|
40 | [eol] | |
|
|
41 | native = LF | |
|
|
42 | EOF | |
|
|
43 | ||
|
|
44 | cat > .hgeol <<EOF | |
|
|
45 | [patterns] | |
|
|
46 | **.txt = native | |
|
|
47 | ||
|
|
48 | [repository] | |
|
|
49 | native = $1 | |
|
|
50 | EOF | |
|
|
51 | ||
|
|
52 | echo '% hg add .hgeol' | |
|
|
53 | hg add .hgeol | |
|
|
54 | echo '% hg status' | |
|
|
55 | hg status | |
|
|
56 | ||
|
|
57 | echo '% hg commit' | |
|
|
58 | hg commit -d '200 0' -m 'Added .hgeol file' | |
|
|
59 | ||
|
|
60 | echo '% hg status' | |
|
|
61 | hg status | |
|
|
62 | ||
|
|
63 | echo '% hg tip -p' | |
|
|
64 | hg tip -p | python $TESTDIR/printrepr.py | |
|
|
65 | ||
|
|
66 | cd .. | |
|
|
67 | rm -r repo-$1 | |
|
|
68 | } | |
|
|
69 | ||
|
|
70 | makerepo | |
|
|
71 | dotest LF | |
|
|
72 | dotest CRLF | |
|
|
73 | rm -r repo | |
|
|
3 | $ cat > $HGRCPATH <<EOF | |
|
|
4 | > [diff] | |
|
|
5 | > git = 1 | |
|
|
6 | > EOF | |
|
|
7 | $ seteol () { | |
|
|
8 | > if [ $1 = "LF" ]; then | |
|
|
9 | > EOL='\n' | |
|
|
10 | > else | |
|
|
11 | > EOL='\r\n' | |
|
|
12 | > fi | |
|
|
13 | > } | |
|
|
14 | $ makerepo () { | |
|
|
15 | > echo | |
|
|
16 | > echo "# ==== setup repository ====" | |
|
|
17 | > echo '% hg init' | |
|
|
18 | > hg init repo | |
|
|
19 | > cd repo | |
|
|
20 | > printf "first\nsecond\nthird\n" > a.txt | |
|
|
21 | > hg commit -d '100 0' --addremove -m 'LF commit' | |
|
|
22 | > cd .. | |
|
|
23 | > } | |
|
|
24 | $ dotest () { | |
|
|
25 | > seteol $1 | |
|
|
26 | > echo | |
|
|
27 | > echo "% hg clone repo repo-$1" | |
|
|
28 | > hg clone repo repo-$1 | |
|
|
29 | > cd repo-$1 | |
|
|
30 | > cat > .hg/hgrc <<EOF | |
|
|
31 | > [extensions] | |
|
|
32 | > eol = | |
|
|
33 | > [eol] | |
|
|
34 | > native = LF | |
|
|
35 | > EOF | |
|
|
36 | > cat > .hgeol <<EOF | |
|
|
37 | > [patterns] | |
|
|
38 | > **.txt = native | |
|
|
39 | > [repository] | |
|
|
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 | |
|
|
1 | NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now