| hg-reviewers |
This patch adds b'' prefixes to make sure we write bytes and add and None in
the end to suppress the output by .write() calls.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/test-commit-interactive-curses.t (2 lines) | |||
| M | tests/test-hardlinks.t (2 lines) | |||
| M | tests/test-import-merge.t (2 lines) | |||
| M | tests/test-revert-interactive.t (10 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 |
| Check that commit -i works with no changes | Check that commit -i works with no changes | ||||
| $ hg commit -i | $ hg commit -i | ||||
| no changes to record | no changes to record | ||||
| [1] | [1] | ||||
| Committing only one file | Committing only one file | ||||
| $ echo "a" >> a | $ echo "a" >> a | ||||
| >>> open('b', 'wb').write("1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n") | >>> open('b', 'wb').write(b"1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n") and None | ||||
| $ hg add b | $ hg add b | ||||
| $ cat <<EOF >testModeCommands | $ cat <<EOF >testModeCommands | ||||
| > TOGGLE | > TOGGLE | ||||
| > KEY_DOWN | > KEY_DOWN | ||||
| > X | > X | ||||
| > EOF | > EOF | ||||
| $ hg commit -i -m "one file" -d "0 0" | $ hg commit -i -m "one file" -d "0 0" | ||||
| $ hg tip | $ hg tip | ||||
| 1 r3/.hg/store/undo.phaseroots | 1 r3/.hg/store/undo.phaseroots | ||||
| Create a non-inlined filelog in r3: | Create a non-inlined filelog in r3: | ||||
| $ cd r3/d1 | $ cd r3/d1 | ||||
| >>> f = open('data1', 'wb') | >>> f = open('data1', 'wb') | ||||
| >>> for x in range(10000): | >>> for x in range(10000): | ||||
| ... f.write("%s\n" % str(x)) | ... f.write(b"%d\n" % x) and None | ||||
| >>> f.close() | >>> f.close() | ||||
| $ for j in 0 1 2 3 4 5 6 7 8 9; do | $ for j in 0 1 2 3 4 5 6 7 8 9; do | ||||
| > cat data1 >> f2 | > cat data1 >> f2 | ||||
| > hg commit -m$j | > hg commit -m$j | ||||
| > done | > done | ||||
| $ cd ../.. | $ cd ../.. | ||||
| $ nlinksdir r3/.hg/store | $ nlinksdir r3/.hg/store | ||||
| $ hg ci -m2 | $ hg ci -m2 | ||||
| $ echo a>a | $ echo a>a | ||||
| $ echo b>>a | $ echo b>>a | ||||
| $ echo a>>a | $ echo a>>a | ||||
| $ hg ci -m3 | $ hg ci -m3 | ||||
| $ hg export 2 | head -7 > ../a.patch | $ hg export 2 | head -7 > ../a.patch | ||||
| $ hg export tip > out | $ hg export tip > out | ||||
| >>> apatch = open("../a.patch", "ab") | >>> apatch = open("../a.patch", "ab") | ||||
| >>> apatch.write("".join(open("out").readlines()[7:])) | >>> apatch.write(b"".join(open("out", 'rb').readlines()[7:])) and None | ||||
| $ cd .. | $ cd .. | ||||
| $ hg clone -qr0 repo3 repo3-clone | $ hg clone -qr0 repo3 repo3-clone | ||||
| $ cd repo3-clone | $ cd repo3-clone | ||||
| $ hg pull -qr1 ../repo3 | $ hg pull -qr1 ../repo3 | ||||
| $ hg import --exact ../a.patch | $ hg import --exact ../a.patch | ||||
| applying ../a.patch | applying ../a.patch | ||||
| > record = | > record = | ||||
| > purge = | > purge = | ||||
| > EOF | > EOF | ||||
| $ mkdir -p a/folder1 a/folder2 | $ mkdir -p a/folder1 a/folder2 | ||||
| $ cd a | $ cd a | ||||
| $ hg init | $ hg init | ||||
| >>> open('f', 'wb').write("1\n2\n3\n4\n5\n") | >>> open('f', 'wb').write(b"1\n2\n3\n4\n5\n") and None | ||||
| $ hg add f ; hg commit -m "adding f" | $ hg add f ; hg commit -m "adding f" | ||||
| $ cat f > folder1/g ; hg add folder1/g ; hg commit -m "adding folder1/g" | $ cat f > folder1/g ; hg add folder1/g ; hg commit -m "adding folder1/g" | ||||
| $ cat f > folder2/h ; hg add folder2/h ; hg commit -m "adding folder2/h" | $ cat f > folder2/h ; hg add folder2/h ; hg commit -m "adding folder2/h" | ||||
| $ cat f > folder1/i ; hg add folder1/i ; hg commit -m "adding folder1/i" | $ cat f > folder1/i ; hg add folder1/i ; hg commit -m "adding folder1/i" | ||||
| >>> open('f', 'wb').write("a\n1\n2\n3\n4\n5\nb\n") | >>> open('f', 'wb').write(b"a\n1\n2\n3\n4\n5\nb\n") and None | ||||
| $ hg commit -m "modifying f" | $ hg commit -m "modifying f" | ||||
| >>> open('folder1/g', 'wb').write("c\n1\n2\n3\n4\n5\nd\n") | >>> open('folder1/g', 'wb').write(b"c\n1\n2\n3\n4\n5\nd\n") and None | ||||
| $ hg commit -m "modifying folder1/g" | $ hg commit -m "modifying folder1/g" | ||||
| >>> open('folder2/h', 'wb').write("e\n1\n2\n3\n4\n5\nf\n") | >>> open('folder2/h', 'wb').write(b"e\n1\n2\n3\n4\n5\nf\n") and None | ||||
| $ hg commit -m "modifying folder2/h" | $ hg commit -m "modifying folder2/h" | ||||
| $ hg tip | $ hg tip | ||||
| changeset: 6:59dd6e4ab63a | changeset: 6:59dd6e4ab63a | ||||
| tag: tip | tag: tip | ||||
| user: test | user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: modifying folder2/h | summary: modifying folder2/h | ||||
| 3 | 3 | ||||
| 4 | 4 | ||||
| 5 | 5 | ||||
| -d | -d | ||||
| apply this change to 'folder1/g'? [Ynesfdaq?] y | apply this change to 'folder1/g'? [Ynesfdaq?] y | ||||
| $ ls folder1/ | $ ls folder1/ | ||||
| g | g | ||||
| >>> open('folder1/g', 'wb').write("1\n2\n3\n4\n5\nd\n") | >>> open('folder1/g', 'wb').write(b"1\n2\n3\n4\n5\nd\n") and None | ||||
| $ hg update -C 6 | $ hg update -C 6 | ||||
| 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ hg revert -i -r 2 --all -- << EOF | $ hg revert -i -r 2 --all -- << EOF | ||||
| > n | > n | ||||
| > y | > y | ||||
| > y | > y | ||||