tests: double escape \ in test-import-eol.t and test-mq-eol.t

The shell eats the \\.

Differential Revision: https://phab.mercurial-scm.org/D5974

tests/test-import-eol.t

@@ -1,173 +1,173
   $ cat > makepatch.py <<EOF
   > import sys
   > f = open(sys.argv[2], 'wb')
   > w = f.write
   > w(b'test message\n')
   > w(b'diff --git a/a b/a\n')
   > w(b'--- a/a\n')
   > w(b'+++ b/a\n')
   > w(b'@@ -1,5 +1,5 @@\n')
   > w(b' a\n')
   > w(b'-bbb\r\n')
   > w(b'+yyyy\r\n')
   > w(b' cc\r\n')
   > w({'empty:lf': b' \n',
   >    'empty:crlf': b' \r\n',
   >    'empty:stripped-lf': b'\n',
   >    'empty:stripped-crlf': b'\r\n'}[sys.argv[1]])
   > w(b' d\n')
   > w(b'-e\n')
-  > w(b'\\ No newline at end of file\n')
+  > w(b'\\\\ No newline at end of file\n')
   > w(b'+z\r\n')
-  > w(b'\\ No newline at end of file\r\n')
+  > w(b'\\\\ No newline at end of file\r\n')
   > EOF
 
   $ hg init repo
   $ cd repo
   $ echo '\.diff' > .hgignore
 
 
 Test different --eol values
 
   $ "$PYTHON" -c 'open("a", "wb").write(b"a\nbbb\ncc\n\nd\ne")'
   $ hg ci -Am adda
   adding .hgignore
   adding a
   $ "$PYTHON" ../makepatch.py empty:lf eol.diff
   $ "$PYTHON" ../makepatch.py empty:crlf eol-empty-crlf.diff
   $ "$PYTHON" ../makepatch.py empty:stripped-lf eol-empty-stripped-lf.diff
   $ "$PYTHON" ../makepatch.py empty:stripped-crlf eol-empty-stripped-crlf.diff
 
 invalid eol
 
   $ hg --config patch.eol='LFCR' import eol.diff
   applying eol.diff
   abort: unsupported line endings type: LFCR
   [255]
   $ hg revert -a
 
 
 force LF
 
   $ hg --traceback --config patch.eol='LF' import eol.diff
   applying eol.diff
   $ hg id
   9e4ef7b3d4af tip
   $ cat a
   a
   yyyy
   cc
   
   d
   e (no-eol)
   $ hg st
 
  (test empty-line variants: all of them should generate the same revision)
 
   $ hg up -qC 0
   $ hg --config patch.eol='LF' import eol-empty-crlf.diff
   applying eol-empty-crlf.diff
   $ hg id
   9e4ef7b3d4af tip
 
   $ hg up -qC 0
   $ hg --config patch.eol='LF' import eol-empty-stripped-lf.diff
   applying eol-empty-stripped-lf.diff
   $ hg id
   9e4ef7b3d4af tip
 
   $ hg up -qC 0
   $ hg --config patch.eol='LF' import eol-empty-stripped-crlf.diff
   applying eol-empty-stripped-crlf.diff
   $ hg id
   9e4ef7b3d4af tip
 
 force CRLF
 
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg --traceback --config patch.eol='CRLF' import eol.diff
   applying eol.diff
   $ cat a
   a\r (esc)
   yyyy\r (esc)
   cc\r (esc)
   \r (esc)
   d\r (esc)
   e (no-eol)
   $ hg st
 
 
 auto EOL on LF file
 
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg --traceback --config patch.eol='auto' import eol.diff
   applying eol.diff
   $ cat a
   a
   yyyy
   cc
   
   d
   e (no-eol)
   $ hg st
 
 
 auto EOL on CRLF file
 
   $ "$PYTHON" -c 'open("a", "wb").write(b"a\r\nbbb\r\ncc\r\n\r\nd\r\ne")'
   $ hg commit -m 'switch EOLs in a'
   $ hg --traceback --config patch.eol='auto' import eol.diff
   applying eol.diff
   $ cat a
   a\r (esc)
   yyyy\r (esc)
   cc\r (esc)
   \r (esc)
   d\r (esc)
   e (no-eol)
   $ hg st
 
 
 auto EOL on new file or source without any EOL
 
   $ "$PYTHON" -c 'open("noeol", "wb").write(b"noeol")'
   $ hg add noeol
   $ hg commit -m 'add noeol'
   $ "$PYTHON" -c 'open("noeol", "wb").write(b"noeol\r\nnoeol\n")'
   $ "$PYTHON" -c 'open("neweol", "wb").write(b"neweol\nneweol\r\n")'
   $ hg add neweol
   $ hg diff --git > noeol.diff
   $ hg revert --no-backup noeol neweol
   $ rm neweol
   $ hg --traceback --config patch.eol='auto' import -m noeol noeol.diff
   applying noeol.diff
   $ cat noeol
   noeol\r (esc)
   noeol
   $ cat neweol
   neweol
   neweol\r (esc)
   $ hg st
 
 
 Test --eol and binary patches
 
   $ "$PYTHON" -c 'open("b", "wb").write(b"a\x00\nb\r\nd")'
   $ hg ci -Am addb
   adding b
   $ "$PYTHON" -c 'open("b", "wb").write(b"a\x00\nc\r\nd")'
   $ hg diff --git > bin.diff
   $ hg revert --no-backup b
 
 binary patch with --eol
 
   $ hg import --config patch.eol='CRLF' -m changeb bin.diff
   applying bin.diff
   $ cat b
   a\x00 (esc)
   c\r (esc)
   d (no-eol)
   $ hg st
   $ cd ..

tests/test-mq-eol.t

@@ -1,215 +1,215
 
 Test interactions between mq and patch.eol
 
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > mq =
   > [diff]
   > nodates = 1
   > EOF
 
   $ cat > makepatch.py <<EOF
   > f = open('eol.diff', 'wb')
   > w = f.write
   > w(b'test message\n')
   > w(b'diff --git a/a b/a\n')
   > w(b'--- a/a\n')
   > w(b'+++ b/a\n')
   > w(b'@@ -1,5 +1,5 @@\n')
   > w(b' a\n')
   > w(b'-b\r\n')
   > w(b'+y\r\n')
   > w(b' c\r\n')
   > w(b' d\n')
   > w(b'-e\n')
-  > w(b'\\ No newline at end of file\n')
+  > w(b'\\\\ No newline at end of file\n')
   > w(b'+z\r\n')
-  > w(b'\\ No newline at end of file\r\n')
+  > w(b'\\\\ No newline at end of file\r\n')
   > EOF
 
   $ cat > cateol.py <<EOF
   > import sys
   > try:
   >     stdout = sys.stdout.buffer
   > except AttributeError:
   >     stdout = sys.stdout
   > for line in open(sys.argv[1], 'rb'):
   >     line = line.replace(b'\r', b'<CR>')
   >     line = line.replace(b'\n', b'<LF>')
   >     stdout.write(line + b'\n')
   > EOF
 
   $ hg init repo
   $ cd repo
   $ echo '\.diff' > .hgignore
   $ echo '\.rej' >> .hgignore
 
 
 Test different --eol values
 
   $ "$PYTHON" -c 'open("a", "wb").write(b"a\nb\nc\nd\ne")'
   $ hg ci -Am adda
   adding .hgignore
   adding a
   $ "$PYTHON" ../makepatch.py
   $ 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)
   patch failed, rejects left in working directory
   errors during apply, please fix and qrefresh eol.diff
   [2]
   $ 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)
   patch failed, rejects left in working directory
   errors during apply, please fix and qrefresh eol.diff
   [2]
   $ 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
   $ "$PYTHON" ../cateol.py .hg/patches/eol.diff
   # HG changeset patch<LF>
   # Parent  0d0bf99a8b7a3842c6f8ef09e34f69156c4bd9d0<LF>
   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>
   $ "$PYTHON" ../cateol.py a
   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
   $ "$PYTHON" ../cateol.py a
   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
   $ "$PYTHON" ../cateol.py a
   a<CR><LF>
   y<CR><LF>
   c<CR><LF>
   d<CR><LF>
   z
   $ hg qpop
   popping eol.diff
   patch queue now empty
   $ cd ..
 
 
 Test .rej file EOL are left unchanged
 
   $ hg init testeol
   $ cd testeol
   $ "$PYTHON" -c "open('a', 'wb').write(b'1\r\n2\r\n3\r\n4')"
   $ hg ci -Am adda
   adding a
   $ "$PYTHON" -c "open('a', 'wb').write(b'1\r\n2\r\n33\r\n4')"
   $ hg qnew patch1
   $ hg qpop
   popping patch1
   patch queue now empty
   $ "$PYTHON" -c "open('a', 'wb').write(b'1\r\n22\r\n33\r\n4')"
   $ 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)
   patch failed, rejects left in working directory
   errors during apply, please fix and qrefresh patch1
   [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)
   patch failed, rejects left in working directory
   errors during apply, please fix and qrefresh patch1
   [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 ..