Show More
@@ -1,21 +1,21 | |||||
1 | $ cat > makepatch.py <<EOF |
|
1 | $ cat > makepatch.py <<EOF | |
2 |
> f = |
|
2 | > f = open('eol.diff', 'wb') | |
3 | > w = f.write |
|
3 | > w = f.write | |
4 | > w('test message\n') |
|
4 | > w(b'test message\n') | |
5 | > w('diff --git a/a b/a\n') |
|
5 | > w(b'diff --git a/a b/a\n') | |
6 | > w('--- a/a\n') |
|
6 | > w(b'--- a/a\n') | |
7 | > w('+++ b/a\n') |
|
7 | > w(b'+++ b/a\n') | |
8 | > w('@@ -1,5 +1,5 @@\n') |
|
8 | > w(b'@@ -1,5 +1,5 @@\n') | |
9 | > w(' a\n') |
|
9 | > w(b' a\n') | |
10 | > w('-bbb\r\n') |
|
10 | > w(b'-bbb\r\n') | |
11 | > w('+yyyy\r\n') |
|
11 | > w(b'+yyyy\r\n') | |
12 | > w(' cc\r\n') |
|
12 | > w(b' cc\r\n') | |
13 | > w(' \n') |
|
13 | > w(b' \n') | |
14 | > w(' d\n') |
|
14 | > w(b' d\n') | |
15 | > w('-e\n') |
|
15 | > w(b'-e\n') | |
16 | > w('\ No newline at end of file\n') |
|
16 | > w(b'\ No newline at end of file\n') | |
17 | > w('+z\r\n') |
|
17 | > w(b'+z\r\n') | |
18 | > w('\ No newline at end of file\r\n') |
|
18 | > w(b'\ No newline at end of file\r\n') | |
19 | > EOF |
|
19 | > EOF | |
20 |
|
20 | |||
21 | $ hg init repo |
|
21 | $ hg init repo | |
@@ -25,7 +25,7 | |||||
25 |
|
25 | |||
26 | Test different --eol values |
|
26 | Test different --eol values | |
27 |
|
27 | |||
28 |
$ $PYTHON -c ' |
|
28 | $ $PYTHON -c 'open("a", "wb").write(b"a\nbbb\ncc\n\nd\ne")' | |
29 | $ hg ci -Am adda |
|
29 | $ hg ci -Am adda | |
30 | adding .hgignore |
|
30 | adding .hgignore | |
31 | adding a |
|
31 | adding a | |
@@ -89,7 +89,7 auto EOL on LF file | |||||
89 |
|
89 | |||
90 | auto EOL on CRLF file |
|
90 | auto EOL on CRLF file | |
91 |
|
91 | |||
92 |
$ $PYTHON -c ' |
|
92 | $ $PYTHON -c 'open("a", "wb").write(b"a\r\nbbb\r\ncc\r\n\r\nd\r\ne")' | |
93 | $ hg commit -m 'switch EOLs in a' |
|
93 | $ hg commit -m 'switch EOLs in a' | |
94 | $ hg --traceback --config patch.eol='auto' import eol.diff |
|
94 | $ hg --traceback --config patch.eol='auto' import eol.diff | |
95 | applying eol.diff |
|
95 | applying eol.diff | |
@@ -105,11 +105,11 auto EOL on CRLF file | |||||
105 |
|
105 | |||
106 | auto EOL on new file or source without any EOL |
|
106 | auto EOL on new file or source without any EOL | |
107 |
|
107 | |||
108 |
$ $PYTHON -c ' |
|
108 | $ $PYTHON -c 'open("noeol", "wb").write(b"noeol")' | |
109 | $ hg add noeol |
|
109 | $ hg add noeol | |
110 | $ hg commit -m 'add noeol' |
|
110 | $ hg commit -m 'add noeol' | |
111 |
$ $PYTHON -c ' |
|
111 | $ $PYTHON -c 'open("noeol", "wb").write(b"noeol\r\nnoeol\n")' | |
112 |
$ $PYTHON -c ' |
|
112 | $ $PYTHON -c 'open("neweol", "wb").write(b"neweol\nneweol\r\n")' | |
113 | $ hg add neweol |
|
113 | $ hg add neweol | |
114 | $ hg diff --git > noeol.diff |
|
114 | $ hg diff --git > noeol.diff | |
115 | $ hg revert --no-backup noeol neweol |
|
115 | $ hg revert --no-backup noeol neweol | |
@@ -127,10 +127,10 auto EOL on new file or source without a | |||||
127 |
|
127 | |||
128 | Test --eol and binary patches |
|
128 | Test --eol and binary patches | |
129 |
|
129 | |||
130 |
$ $PYTHON -c ' |
|
130 | $ $PYTHON -c 'open("b", "wb").write(b"a\x00\nb\r\nd")' | |
131 | $ hg ci -Am addb |
|
131 | $ hg ci -Am addb | |
132 | adding b |
|
132 | adding b | |
133 |
$ $PYTHON -c ' |
|
133 | $ $PYTHON -c 'open("b", "wb").write(b"a\x00\nc\r\nd")' | |
134 | $ hg diff --git > bin.diff |
|
134 | $ hg diff --git > bin.diff | |
135 | $ hg revert --no-backup b |
|
135 | $ hg revert --no-backup b | |
136 |
|
136 |
General Comments 0
You need to be logged in to leave comments.
Login now