Mercurial > hg
comparison tests/test-mq-eol.t @ 32940:75be14993fda
cleanup: use $PYTHON to run python in many more tests
Spotted one of these, then wrote a check-code rule that caught them
all. It will be the next change.
author | Augie Fackler <augie@google.com> |
---|---|
date | Tue, 20 Jun 2017 09:45:02 -0400 |
parents | bbf544b5f2e9 |
children | 24849d53697d |
comparison
equal
deleted
inserted
replaced
32939:cad62cb3c84c | 32940:75be14993fda |
---|---|
46 | 46 |
47 $ $PYTHON -c 'file("a", "wb").write("a\nb\nc\nd\ne")' | 47 $ $PYTHON -c 'file("a", "wb").write("a\nb\nc\nd\ne")' |
48 $ hg ci -Am adda | 48 $ hg ci -Am adda |
49 adding .hgignore | 49 adding .hgignore |
50 adding a | 50 adding a |
51 $ python ../makepatch.py | 51 $ $PYTHON ../makepatch.py |
52 $ hg qimport eol.diff | 52 $ hg qimport eol.diff |
53 adding eol.diff to series file | 53 adding eol.diff to series file |
54 | 54 |
55 should fail in strict mode | 55 should fail in strict mode |
56 | 56 |
83 | 83 |
84 $ hg --config patch.eol='CRLF' qpush | 84 $ hg --config patch.eol='CRLF' qpush |
85 applying eol.diff | 85 applying eol.diff |
86 now at: eol.diff | 86 now at: eol.diff |
87 $ hg qrefresh | 87 $ hg qrefresh |
88 $ python ../cateol.py .hg/patches/eol.diff | 88 $ $PYTHON ../cateol.py .hg/patches/eol.diff |
89 # HG changeset patch<LF> | 89 # HG changeset patch<LF> |
90 # Parent 0d0bf99a8b7a3842c6f8ef09e34f69156c4bd9d0<LF> | 90 # Parent 0d0bf99a8b7a3842c6f8ef09e34f69156c4bd9d0<LF> |
91 test message<LF> | 91 test message<LF> |
92 <LF> | 92 <LF> |
93 diff -r 0d0bf99a8b7a a<LF> | 93 diff -r 0d0bf99a8b7a a<LF> |
104 +y<CR><LF> | 104 +y<CR><LF> |
105 +c<CR><LF> | 105 +c<CR><LF> |
106 +d<CR><LF> | 106 +d<CR><LF> |
107 +z<LF> | 107 +z<LF> |
108 \ No newline at end of file<LF> | 108 \ No newline at end of file<LF> |
109 $ python ../cateol.py a | 109 $ $PYTHON ../cateol.py a |
110 a<CR><LF> | 110 a<CR><LF> |
111 y<CR><LF> | 111 y<CR><LF> |
112 c<CR><LF> | 112 c<CR><LF> |
113 d<CR><LF> | 113 d<CR><LF> |
114 z | 114 z |
119 push again forcing LF and compare revisions | 119 push again forcing LF and compare revisions |
120 | 120 |
121 $ hg --config patch.eol='CRLF' qpush | 121 $ hg --config patch.eol='CRLF' qpush |
122 applying eol.diff | 122 applying eol.diff |
123 now at: eol.diff | 123 now at: eol.diff |
124 $ python ../cateol.py a | 124 $ $PYTHON ../cateol.py a |
125 a<CR><LF> | 125 a<CR><LF> |
126 y<CR><LF> | 126 y<CR><LF> |
127 c<CR><LF> | 127 c<CR><LF> |
128 d<CR><LF> | 128 d<CR><LF> |
129 z | 129 z |
134 push again without LF and compare revisions | 134 push again without LF and compare revisions |
135 | 135 |
136 $ hg qpush | 136 $ hg qpush |
137 applying eol.diff | 137 applying eol.diff |
138 now at: eol.diff | 138 now at: eol.diff |
139 $ python ../cateol.py a | 139 $ $PYTHON ../cateol.py a |
140 a<CR><LF> | 140 a<CR><LF> |
141 y<CR><LF> | 141 y<CR><LF> |
142 c<CR><LF> | 142 c<CR><LF> |
143 d<CR><LF> | 143 d<CR><LF> |
144 z | 144 z |