| hg-reviewers |
file() is not present in Python 3.
This patch also adds b'' prefixes to make sure we write bytes in Python 3.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/test-import-eol.t (46 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit |
| $ cat > makepatch.py <<EOF | $ cat > makepatch.py <<EOF | ||||
| > f = file('eol.diff', 'wb') | > f = open('eol.diff', 'wb') | ||||
| > w = f.write | > w = f.write | ||||
| > w('test message\n') | > w(b'test message\n') | ||||
| > w('diff --git a/a b/a\n') | > w(b'diff --git a/a b/a\n') | ||||
| > w('--- a/a\n') | > w(b'--- a/a\n') | ||||
| > w('+++ b/a\n') | > w(b'+++ b/a\n') | ||||
| > w('@@ -1,5 +1,5 @@\n') | > w(b'@@ -1,5 +1,5 @@\n') | ||||
| > w(' a\n') | > w(b' a\n') | ||||
| > w('-bbb\r\n') | > w(b'-bbb\r\n') | ||||
| > w('+yyyy\r\n') | > w(b'+yyyy\r\n') | ||||
| > w(' cc\r\n') | > w(b' cc\r\n') | ||||
| > w(' \n') | > w(b' \n') | ||||
| > w(' d\n') | > w(b' d\n') | ||||
| > w('-e\n') | > w(b'-e\n') | ||||
| > w('\ No newline at end of file\n') | > w(b'\ No newline at end of file\n') | ||||
| > w('+z\r\n') | > w(b'+z\r\n') | ||||
| > w('\ No newline at end of file\r\n') | > w(b'\ No newline at end of file\r\n') | ||||
| > EOF | > EOF | ||||
| $ hg init repo | $ hg init repo | ||||
| $ cd repo | $ cd repo | ||||
| $ echo '\.diff' > .hgignore | $ echo '\.diff' > .hgignore | ||||
| Test different --eol values | Test different --eol values | ||||
| $ $PYTHON -c 'file("a", "wb").write("a\nbbb\ncc\n\nd\ne")' | $ $PYTHON -c 'open("a", "wb").write(b"a\nbbb\ncc\n\nd\ne")' | ||||
| $ hg ci -Am adda | $ hg ci -Am adda | ||||
| adding .hgignore | adding .hgignore | ||||
| adding a | adding a | ||||
| $ $PYTHON ../makepatch.py | $ $PYTHON ../makepatch.py | ||||
| invalid eol | invalid eol | ||||
| d | d | ||||
| e (no-eol) | e (no-eol) | ||||
| $ hg st | $ hg st | ||||
| auto EOL on CRLF file | auto EOL on CRLF file | ||||
| $ $PYTHON -c 'file("a", "wb").write("a\r\nbbb\r\ncc\r\n\r\nd\r\ne")' | $ $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 commit -m 'switch EOLs in a' | ||||
| $ hg --traceback --config patch.eol='auto' import eol.diff | $ hg --traceback --config patch.eol='auto' import eol.diff | ||||
| applying eol.diff | applying eol.diff | ||||
| $ cat a | $ cat a | ||||
| a\r (esc) | a\r (esc) | ||||
| yyyy\r (esc) | yyyy\r (esc) | ||||
| cc\r (esc) | cc\r (esc) | ||||
| \r (esc) | \r (esc) | ||||
| d\r (esc) | d\r (esc) | ||||
| e (no-eol) | e (no-eol) | ||||
| $ hg st | $ hg st | ||||
| auto EOL on new file or source without any EOL | auto EOL on new file or source without any EOL | ||||
| $ $PYTHON -c 'file("noeol", "wb").write("noeol")' | $ $PYTHON -c 'open("noeol", "wb").write(b"noeol")' | ||||
| $ hg add noeol | $ hg add noeol | ||||
| $ hg commit -m 'add noeol' | $ hg commit -m 'add noeol' | ||||
| $ $PYTHON -c 'file("noeol", "wb").write("noeol\r\nnoeol\n")' | $ $PYTHON -c 'open("noeol", "wb").write(b"noeol\r\nnoeol\n")' | ||||
| $ $PYTHON -c 'file("neweol", "wb").write("neweol\nneweol\r\n")' | $ $PYTHON -c 'open("neweol", "wb").write(b"neweol\nneweol\r\n")' | ||||
| $ hg add neweol | $ hg add neweol | ||||
| $ hg diff --git > noeol.diff | $ hg diff --git > noeol.diff | ||||
| $ hg revert --no-backup noeol neweol | $ hg revert --no-backup noeol neweol | ||||
| $ rm neweol | $ rm neweol | ||||
| $ hg --traceback --config patch.eol='auto' import -m noeol noeol.diff | $ hg --traceback --config patch.eol='auto' import -m noeol noeol.diff | ||||
| applying noeol.diff | applying noeol.diff | ||||
| $ cat noeol | $ cat noeol | ||||
| noeol\r (esc) | noeol\r (esc) | ||||
| noeol | noeol | ||||
| $ cat neweol | $ cat neweol | ||||
| neweol | neweol | ||||
| neweol\r (esc) | neweol\r (esc) | ||||
| $ hg st | $ hg st | ||||
| Test --eol and binary patches | Test --eol and binary patches | ||||
| $ $PYTHON -c 'file("b", "wb").write("a\x00\nb\r\nd")' | $ $PYTHON -c 'open("b", "wb").write(b"a\x00\nb\r\nd")' | ||||
| $ hg ci -Am addb | $ hg ci -Am addb | ||||
| adding b | adding b | ||||
| $ $PYTHON -c 'file("b", "wb").write("a\x00\nc\r\nd")' | $ $PYTHON -c 'open("b", "wb").write(b"a\x00\nc\r\nd")' | ||||
| $ hg diff --git > bin.diff | $ hg diff --git > bin.diff | ||||
| $ hg revert --no-backup b | $ hg revert --no-backup b | ||||
| binary patch with --eol | binary patch with --eol | ||||
| $ hg import --config patch.eol='CRLF' -m changeb bin.diff | $ hg import --config patch.eol='CRLF' -m changeb bin.diff | ||||
| applying bin.diff | applying bin.diff | ||||
| $ cat b | $ cat b | ||||
| a\x00 (esc) | a\x00 (esc) | ||||
| c\r (esc) | c\r (esc) | ||||
| d (no-eol) | d (no-eol) | ||||
| $ hg st | $ hg st | ||||
| $ cd .. | $ cd .. | ||||