test-mq-eol.t
211 lines
| 4.1 KiB
| text/troff
|
Tads3Lexer
/ tests / test-mq-eol.t
|
r11895 | |||
Test interactions between mq and patch.eol | ||||
|
r23172 | $ cat <<EOF >> $HGRCPATH | ||
> [extensions] | ||||
> mq = | ||||
> [diff] | ||||
> nodates = 1 | ||||
> EOF | ||||
|
r11895 | |||
$ cat > makepatch.py <<EOF | ||||
|
r35963 | > f = open('eol.diff', 'wb') | ||
|
r11895 | > w = f.write | ||
> w('test message\n') | ||||
> w('diff --git a/a b/a\n') | ||||
> w('--- a/a\n') | ||||
> w('+++ b/a\n') | ||||
> w('@@ -1,5 +1,5 @@\n') | ||||
> w(' a\n') | ||||
> w('-b\r\n') | ||||
> w('+y\r\n') | ||||
> w(' c\r\n') | ||||
> w(' d\n') | ||||
> w('-e\n') | ||||
> w('\ No newline at end of file\n') | ||||
> w('+z\r\n') | ||||
> w('\ No newline at end of file\r\n') | ||||
> EOF | ||||
$ cat > cateol.py <<EOF | ||||
> import sys | ||||
|
r35963 | > for line in open(sys.argv[1], 'rb'): | ||
|
r11895 | > line = line.replace('\r', '<CR>') | ||
> line = line.replace('\n', '<LF>') | ||||
|
r33687 | > print(line) | ||
|
r11895 | > EOF | ||
$ hg init repo | ||||
$ cd repo | ||||
$ echo '\.diff' > .hgignore | ||||
$ echo '\.rej' >> .hgignore | ||||
Test different --eol values | ||||
|
r35963 | $ $PYTHON -c 'open("a", "wb").write("a\nb\nc\nd\ne")' | ||
|
r11895 | $ hg ci -Am adda | ||
adding .hgignore | ||||
adding a | ||||
|
r32940 | $ $PYTHON ../makepatch.py | ||
|
r11895 | $ hg qimport eol.diff | ||
adding eol.diff to series file | ||||
should fail in strict mode | ||||
$ hg qpush | ||||
applying eol.diff | ||||
patching file a | ||||
Hunk #1 FAILED at 0 | ||||
1 out of 1 hunks FAILED -- saving rejects to file a.rej | ||||
patch failed, unable to continue (try -v) | ||||
|
r24365 | patch failed, rejects left in working directory | ||
|
r26780 | errors during apply, please fix and qrefresh eol.diff | ||
|
r12316 | [2] | ||
|
r11895 | $ hg qpop | ||
popping eol.diff | ||||
patch queue now empty | ||||
invalid eol | ||||
$ hg --config patch.eol='LFCR' qpush | ||||
applying eol.diff | ||||
patch failed, unable to continue (try -v) | ||||
|
r24365 | patch failed, rejects left in working directory | ||
|
r26780 | errors during apply, please fix and qrefresh eol.diff | ||
|
r12316 | [2] | ||
|
r11895 | $ hg qpop | ||
popping eol.diff | ||||
patch queue now empty | ||||
force LF | ||||
$ hg --config patch.eol='CRLF' qpush | ||||
applying eol.diff | ||||
now at: eol.diff | ||||
$ hg qrefresh | ||||
|
r32940 | $ $PYTHON ../cateol.py .hg/patches/eol.diff | ||
|
r22545 | # HG changeset patch<LF> | ||
# Parent 0d0bf99a8b7a3842c6f8ef09e34f69156c4bd9d0<LF> | ||||
|
r11895 | test message<LF> | ||
<LF> | ||||
diff -r 0d0bf99a8b7a a<LF> | ||||
--- a/a<LF> | ||||
+++ b/a<LF> | ||||
@@ -1,5 +1,5 @@<LF> | ||||
-a<LF> | ||||
-b<LF> | ||||
-c<LF> | ||||
-d<LF> | ||||
-e<LF> | ||||
\ No newline at end of file<LF> | ||||
+a<CR><LF> | ||||
+y<CR><LF> | ||||
+c<CR><LF> | ||||
+d<CR><LF> | ||||
+z<LF> | ||||
\ No newline at end of file<LF> | ||||
|
r32940 | $ $PYTHON ../cateol.py a | ||
|
r11895 | a<CR><LF> | ||
y<CR><LF> | ||||
c<CR><LF> | ||||
d<CR><LF> | ||||
z | ||||
$ hg qpop | ||||
popping eol.diff | ||||
patch queue now empty | ||||
push again forcing LF and compare revisions | ||||
$ hg --config patch.eol='CRLF' qpush | ||||
applying eol.diff | ||||
now at: eol.diff | ||||
|
r32940 | $ $PYTHON ../cateol.py a | ||
|
r11895 | a<CR><LF> | ||
y<CR><LF> | ||||
c<CR><LF> | ||||
d<CR><LF> | ||||
z | ||||
$ hg qpop | ||||
popping eol.diff | ||||
patch queue now empty | ||||
push again without LF and compare revisions | ||||
$ hg qpush | ||||
applying eol.diff | ||||
now at: eol.diff | ||||
|
r32940 | $ $PYTHON ../cateol.py a | ||
|
r11895 | a<CR><LF> | ||
y<CR><LF> | ||||
c<CR><LF> | ||||
d<CR><LF> | ||||
z | ||||
$ hg qpop | ||||
popping eol.diff | ||||
patch queue now empty | ||||
|
r13100 | $ cd .. | ||
Test .rej file EOL are left unchanged | ||||
$ hg init testeol | ||||
$ cd testeol | ||||
|
r35963 | $ $PYTHON -c "open('a', 'wb').write('1\r\n2\r\n3\r\n4')" | ||
|
r13100 | $ hg ci -Am adda | ||
adding a | ||||
|
r35963 | $ $PYTHON -c "open('a', 'wb').write('1\r\n2\r\n33\r\n4')" | ||
|
r13100 | $ hg qnew patch1 | ||
$ hg qpop | ||||
popping patch1 | ||||
patch queue now empty | ||||
|
r35963 | $ $PYTHON -c "open('a', 'wb').write('1\r\n22\r\n33\r\n4')" | ||
|
r13100 | $ hg ci -m changea | ||
$ hg --config 'patch.eol=LF' qpush | ||||
applying patch1 | ||||
patching file a | ||||
Hunk #1 FAILED at 0 | ||||
1 out of 1 hunks FAILED -- saving rejects to file a.rej | ||||
patch failed, unable to continue (try -v) | ||||
|
r24365 | patch failed, rejects left in working directory | ||
|
r26780 | errors during apply, please fix and qrefresh patch1 | ||
|
r13100 | [2] | ||
$ hg qpop | ||||
popping patch1 | ||||
patch queue now empty | ||||
$ cat a.rej | ||||
--- a | ||||
+++ a | ||||
@@ -1,4 +1,4 @@ | ||||
1\r (esc) | ||||
2\r (esc) | ||||
-3\r (esc) | ||||
+33\r (esc) | ||||
4 | ||||
\ No newline at end of file | ||||
$ hg --config 'patch.eol=auto' qpush | ||||
applying patch1 | ||||
patching file a | ||||
Hunk #1 FAILED at 0 | ||||
1 out of 1 hunks FAILED -- saving rejects to file a.rej | ||||
patch failed, unable to continue (try -v) | ||||
|
r24365 | patch failed, rejects left in working directory | ||
|
r26780 | errors during apply, please fix and qrefresh patch1 | ||
|
r13100 | [2] | ||
$ hg qpop | ||||
popping patch1 | ||||
patch queue now empty | ||||
$ cat a.rej | ||||
--- a | ||||
+++ a | ||||
@@ -1,4 +1,4 @@ | ||||
1\r (esc) | ||||
2\r (esc) | ||||
-3\r (esc) | ||||
+33\r (esc) | ||||
4 | ||||
\ No newline at end of file | ||||
$ cd .. | ||||