py3: fix .write() calls in few tests

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.

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

tests/test-commit-interactive-curses.t

@@ -1,426 +1,426 b''
 #require tic
 
 Set up a repo
 
   $ cp $HGRCPATH $HGRCPATH.pretest
   $ cat <<EOF >> $HGRCPATH
   > [ui]
   > interactive = true
   > interface = curses
   > [experimental]
   > crecordtest = testModeCommands
   > EOF
 
 Record with noeol at eof (issue5268)
   $ hg init noeol
   $ cd noeol
   $ printf '0' > a
   $ printf '0\n' > b
   $ hg ci -Aqm initial
   $ printf '1\n0' > a
   $ printf '1\n0\n' > b
   $ cat <<EOF >testModeCommands
   > c
   > EOF
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit  -i -m "add hunks" -d "0 0"
   $ cd ..
 
 Normal repo
   $ hg init a
   $ cd a
 
 Committing some changes but stopping on the way
 
   $ echo "a" > a
   $ hg add a
   $ cat <<EOF >testModeCommands
   > TOGGLE
   > X
   > EOF
   $ hg commit -i  -m "a" -d "0 0"
   no changes to record
   [1]
   $ hg tip
   changeset:   -1:000000000000
   tag:         tip
   user:        
   date:        Thu Jan 01 00:00:00 1970 +0000
   
 
 Committing some changes
 
   $ cat <<EOF >testModeCommands
   > X
   > EOF
   $ hg commit -i  -m "a" -d "0 0"
   $ hg tip
   changeset:   0:cb9a9f314b8b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
 Check that commit -i works with no changes
   $ hg commit -i
   no changes to record
   [1]
 
 Committing only one file
 
   $ 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
   $ cat <<EOF >testModeCommands
   > TOGGLE
   > KEY_DOWN
   > X
   > EOF
   $ hg commit -i  -m "one file" -d "0 0"
   $ hg tip
   changeset:   1:fb2705a663ea
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     one file
   
   $ hg cat -r tip a
   a
   $ cat a
   a
   a
 
 Committing only one hunk while aborting edition of hunk
 
 - Untoggle all the hunks, go down to the second file
 - unfold it
 - go down to second hunk (1 for the first hunk, 1 for the first hunkline, 1 for the second hunk, 1 for the second hunklike)
 - toggle the second hunk
 - toggle on and off the amend mode (to check that it toggles off)
 - edit the hunk and quit the editor immediately with non-zero status
 - commit
 
   $ printf "printf 'editor ran\n'; exit 1" > editor.sh
   $ echo "x" > c
   $ cat b >> c
   $ echo "y" >> c
   $ mv c b
   $ cat <<EOF >testModeCommands
   > A
   > KEY_DOWN
   > f
   > KEY_DOWN
   > KEY_DOWN
   > KEY_DOWN
   > KEY_DOWN
   > TOGGLE
   > a
   > a
   > e
   > X
   > EOF
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i  -m "one hunk" -d "0 0"
   editor ran
   $ rm editor.sh
   $ hg tip
   changeset:   2:7d10dfe755a8
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     one hunk
   
   $ hg cat -r tip b
   1
   2
   3
   4
   5
   6
   7
   8
   9
   10
   y
   $ cat b
   x
   1
   2
   3
   4
   5
   6
   7
   8
   9
   10
   y
   $ hg commit -m "other hunks"
   $ hg tip
   changeset:   3:a6735021574d
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     other hunks
   
   $ hg cat -r tip b
   x
   1
   2
   3
   4
   5
   6
   7
   8
   9
   10
   y
 
 Newly added files can be selected with the curses interface
 
   $ hg update -C .
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo "hello" > x
   $ hg add x
   $ cat <<EOF >testModeCommands
   > TOGGLE
   > TOGGLE
   > X
   > EOF
   $ hg st
   A x
   ? testModeCommands
   $ hg commit -i  -m "newly added file" -d "0 0"
   $ hg st
   ? testModeCommands
 
 Amend option works
   $ echo "hello world" > x
   $ hg diff -c .
   diff -r a6735021574d -r 2b0e9be4d336 x
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/x	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +hello
   $ cat <<EOF >testModeCommands
   > a
   > X
   > EOF
   $ hg commit -i  -m "newly added file" -d "0 0"
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/2b0e9be4d336-3cf0bc8c-amend.hg
   $ hg diff -c .
   diff -r a6735021574d -r c1d239d165ae x
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/x	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +hello world
 
 Editing a hunk puts you back on that hunk when done editing (issue5041)
 To do that, we change two lines in a file, pretend to edit the second line,
 exit, toggle the line selected at the end of the edit and commit.
 The first line should be recorded if we were put on the second line at the end
 of the edit.
 
   $ hg update -C .
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo "foo" > x
   $ echo "hello world" >> x
   $ echo "bar" >> x
   $ cat <<EOF >testModeCommands
   > f
   > KEY_DOWN
   > KEY_DOWN
   > KEY_DOWN
   > KEY_DOWN
   > e
   > TOGGLE
   > X
   > EOF
   $ printf "printf 'editor ran\n'; exit 0" > editor.sh
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit  -i -m "edit hunk" -d "0 0"
   editor ran
   $ hg cat -r . x
   foo
   hello world
 
 Testing the review option. The entire final filtered patch should show
 up in the editor and be editable. We will unselect the second file and
 the first hunk of the third file. During review, we will decide that
 "lower" sounds better than "bottom", and the final commit should
 reflect this edition.
 
   $ hg update -C .
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo "top" > c
   $ cat x >> c
   $ echo "bottom" >> c
   $ mv c x
   $ echo "third a" >> a
   $ echo "we will unselect this" >> b
 
   $ cat > editor.sh <<EOF
   > cat "\$1"
   > cat "\$1" | sed s/bottom/lower/ > tmp
   > mv tmp "\$1"
   > EOF
   $ cat > testModeCommands <<EOF
   > KEY_DOWN
   > TOGGLE
   > KEY_DOWN
   > f
   > KEY_DOWN
   > TOGGLE
   > R
   > EOF
 
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit  -i -m "review hunks" -d "0 0"
   # To remove '-' lines, make them ' ' lines (context).
   # To remove '+' lines, delete them.
   # Lines starting with # will be removed from the patch.
   #
   # If the patch applies cleanly, the edited patch will immediately
   # be finalised. If it does not apply cleanly, rejects files will be
   # generated. You can use those when you try again.
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,2 +1,3 @@
    a
    a
   +third a
   diff --git a/x b/x
   --- a/x
   +++ b/x
   @@ -1,2 +1,3 @@
    foo
    hello world
   +bottom
 
   $ hg cat -r . a
   a
   a
   third a
 
   $ hg cat -r . b
   x
   1
   2
   3
   4
   5
   6
   7
   8
   9
   10
   y
 
   $ hg cat -r . x
   foo
   hello world
   lower
 
 Check spacemovesdown
 
   $ cat <<EOF >> $HGRCPATH
   > [experimental]
   > spacemovesdown = true
   > EOF
   $ cat <<EOF >testModeCommands
   > TOGGLE
   > TOGGLE
   > X
   > EOF
   $ hg status -q
   M b
   M x
   $ hg commit -i -m "nothing to commit?" -d "0 0"
   no changes to record
   [1]
 
 Check ui.interface logic for the chunkselector
 
 The default interface is text
   $ cp $HGRCPATH.pretest $HGRCPATH
   $ chunkselectorinterface() {
   > $PYTHON <<EOF
   > from mercurial import hg, ui;\
   > repo = hg.repository(ui.ui.load(), ".");\
   > print(repo.ui.interface("chunkselector"))
   > EOF
   > }
   $ chunkselectorinterface
   text
 
 If only the default is set, we'll use that for the feature, too
   $ cp $HGRCPATH.pretest $HGRCPATH
   $ cat <<EOF >> $HGRCPATH
   > [ui]
   > interface = curses
   > EOF
   $ chunkselectorinterface
   curses
 
 It is possible to override the default interface with a feature specific
 interface
   $ cp $HGRCPATH.pretest $HGRCPATH
   $ cat <<EOF >> $HGRCPATH
   > [ui]
   > interface = text
   > interface.chunkselector = curses
   > EOF
 
   $ chunkselectorinterface
   curses
 
   $ cp $HGRCPATH.pretest $HGRCPATH
   $ cat <<EOF >> $HGRCPATH
   > [ui]
   > interface = curses
   > interface.chunkselector = text
   > EOF
 
   $ chunkselectorinterface
   text
 
 If a bad interface name is given, we use the default value (with a nice
 error message to suggest that the configuration needs to be fixed)
 
   $ cp $HGRCPATH.pretest $HGRCPATH
   $ cat <<EOF >> $HGRCPATH
   > [ui]
   > interface = blah
   > EOF
   $ chunkselectorinterface
   invalid value for ui.interface: blah (using text)
   text
 
   $ cp $HGRCPATH.pretest $HGRCPATH
   $ cat <<EOF >> $HGRCPATH
   > [ui]
   > interface = curses
   > interface.chunkselector = blah
   > EOF
   $ chunkselectorinterface
   invalid value for ui.interface.chunkselector: blah (using curses)
   curses
 
   $ cp $HGRCPATH.pretest $HGRCPATH
   $ cat <<EOF >> $HGRCPATH
   > [ui]
   > interface = blah
   > interface.chunkselector = curses
   > EOF
   $ chunkselectorinterface
   invalid value for ui.interface: blah
   curses
 
   $ cp $HGRCPATH.pretest $HGRCPATH
   $ cat <<EOF >> $HGRCPATH
   > [ui]
   > interface = blah
   > interface.chunkselector = blah
   > EOF
   $ chunkselectorinterface
   invalid value for ui.interface: blah
   invalid value for ui.interface.chunkselector: blah (using text)
   text

tests/test-hardlinks.t

@@ -1,429 +1,429 b''
 #require hardlink reporevlogstore
 
   $ cat > nlinks.py <<EOF
   > from __future__ import print_function
   > import sys
   > from mercurial import util
   > for f in sorted(sys.stdin.readlines()):
   >     f = f[:-1]
   >     print(util.nlinks(f), f)
   > EOF
 
   $ nlinksdir()
   > {
   >     find "$@" -type f | $PYTHON $TESTTMP/nlinks.py
   > }
 
 Some implementations of cp can't create hardlinks (replaces 'cp -al' on Linux):
 
   $ cat > linkcp.py <<EOF
   > from __future__ import absolute_import
   > import sys
   > from mercurial import util
   > util.copyfiles(sys.argv[1], sys.argv[2], hardlink=True)
   > EOF
 
   $ linkcp()
   > {
   >     $PYTHON $TESTTMP/linkcp.py $1 $2
   > }
 
 Prepare repo r1:
 
   $ hg init r1
   $ cd r1
 
   $ echo c1 > f1
   $ hg add f1
   $ hg ci -m0
 
   $ mkdir d1
   $ cd d1
   $ echo c2 > f2
   $ hg add f2
   $ hg ci -m1
   $ cd ../..
 
   $ nlinksdir r1/.hg/store
   1 r1/.hg/store/00changelog.i
   1 r1/.hg/store/00manifest.i
   1 r1/.hg/store/data/d1/f2.i
   1 r1/.hg/store/data/f1.i
   1 r1/.hg/store/fncache (repofncache !)
   1 r1/.hg/store/phaseroots
   1 r1/.hg/store/undo
   1 r1/.hg/store/undo.backup.fncache (repofncache !)
   1 r1/.hg/store/undo.backupfiles
   1 r1/.hg/store/undo.phaseroots
 
 
 Create hardlinked clone r2:
 
   $ hg clone -U --debug r1 r2 --config progress.debug=true
   linking: 1
   linking: 2
   linking: 3
   linking: 4
   linking: 5
   linking: 6
   linking: 7
   linked 7 files
 
 Create non-hardlinked clone r3:
 
   $ hg clone --pull r1 r3
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   new changesets 40d85e9847f2:7069c422939c
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 
 Repos r1 and r2 should now contain hardlinked files:
 
   $ nlinksdir r1/.hg/store
   2 r1/.hg/store/00changelog.i
   2 r1/.hg/store/00manifest.i
   2 r1/.hg/store/data/d1/f2.i
   2 r1/.hg/store/data/f1.i
   2 r1/.hg/store/fncache (repofncache !)
   1 r1/.hg/store/phaseroots
   1 r1/.hg/store/undo
   1 r1/.hg/store/undo.backup.fncache (repofncache !)
   1 r1/.hg/store/undo.backupfiles
   1 r1/.hg/store/undo.phaseroots
 
   $ nlinksdir r2/.hg/store
   2 r2/.hg/store/00changelog.i
   2 r2/.hg/store/00manifest.i
   2 r2/.hg/store/data/d1/f2.i
   2 r2/.hg/store/data/f1.i
   2 r2/.hg/store/fncache (repofncache !)
 
 Repo r3 should not be hardlinked:
 
   $ nlinksdir r3/.hg/store
   1 r3/.hg/store/00changelog.i
   1 r3/.hg/store/00manifest.i
   1 r3/.hg/store/data/d1/f2.i
   1 r3/.hg/store/data/f1.i
   1 r3/.hg/store/fncache (repofncache !)
   1 r3/.hg/store/phaseroots
   1 r3/.hg/store/undo
   1 r3/.hg/store/undo.backupfiles
   1 r3/.hg/store/undo.phaseroots
 
 
 Create a non-inlined filelog in r3:
 
   $ cd r3/d1
   >>> f = open('data1', 'wb')
   >>> for x in range(10000):
-  ...     f.write("%s\n" % str(x))
+  ...     f.write(b"%d\n" % x) and None
   >>> f.close()
   $ for j in 0 1 2 3 4 5 6 7 8 9; do
   >   cat data1 >> f2
   >   hg commit -m$j
   > done
   $ cd ../..
 
   $ nlinksdir r3/.hg/store
   1 r3/.hg/store/00changelog.i
   1 r3/.hg/store/00manifest.i
   1 r3/.hg/store/data/d1/f2.d
   1 r3/.hg/store/data/d1/f2.i
   1 r3/.hg/store/data/f1.i
   1 r3/.hg/store/fncache (repofncache !)
   1 r3/.hg/store/phaseroots
   1 r3/.hg/store/undo
   1 r3/.hg/store/undo.backup.fncache (repofncache !)
   1 r3/.hg/store/undo.backup.phaseroots
   1 r3/.hg/store/undo.backupfiles
   1 r3/.hg/store/undo.phaseroots
 
 Push to repo r1 should break up most hardlinks in r2:
 
   $ hg -R r2 verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 2 changesets, 2 total revisions
 
   $ cd r3
   $ hg push
   pushing to $TESTTMP/r1
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 10 changesets with 10 changes to 1 files
 
   $ cd ..
 
   $ nlinksdir r2/.hg/store
   1 r2/.hg/store/00changelog.i
   1 r2/.hg/store/00manifest.i
   1 r2/.hg/store/data/d1/f2.i
   2 r2/.hg/store/data/f1.i
   [12] r2/\.hg/store/fncache (re) (repofncache !)
 
 #if hardlink-whitelisted repofncache
   $ nlinksdir r2/.hg/store/fncache
   2 r2/.hg/store/fncache
 #endif
 
   $ hg -R r2 verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 2 changesets, 2 total revisions
 
 
   $ cd r1
   $ hg up
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Committing a change to f1 in r1 must break up hardlink f1.i in r2:
 
   $ echo c1c1 >> f1
   $ hg ci -m00
   $ cd ..
 
   $ nlinksdir r2/.hg/store
   1 r2/.hg/store/00changelog.i
   1 r2/.hg/store/00manifest.i
   1 r2/.hg/store/data/d1/f2.i
   1 r2/.hg/store/data/f1.i
   [12] r2/\.hg/store/fncache (re) (repofncache !)
 
 #if hardlink-whitelisted repofncache
   $ nlinksdir r2/.hg/store/fncache
   2 r2/.hg/store/fncache
 #endif
 
 Create a file which exec permissions we will change
   $ cd r3
   $ echo "echo hello world" > f3
   $ hg add f3
   $ hg ci -mf3
   $ cd ..
 
   $ cd r3
   $ hg tip --template '{rev}:{node|short}\n'
   12:d3b77733a28a
   $ echo bla > f1
   $ chmod +x f3
   $ hg ci -m1
   $ cd ..
 
 Create hardlinked copy r4 of r3 (on Linux, we would call 'cp -al'):
 
   $ linkcp r3 r4
 
 'checklink' is produced by hardlinking a symlink, which is undefined whether
 the symlink should be followed or not. It does behave differently on Linux and
 BSD. Just remove it so the test pass on both platforms.
 
   $ rm -f r4/.hg/cache/checklink
 
 r4 has hardlinks in the working dir (not just inside .hg):
 
   $ nlinksdir r4
   2 r4/.hg/00changelog.i
   2 r4/.hg/branch
   2 r4/.hg/cache/branch2-base
   2 r4/.hg/cache/branch2-served
   2 r4/.hg/cache/checkisexec (execbit !)
   ? r4/.hg/cache/checklink-target (glob) (symlink !)
   2 r4/.hg/cache/checknoexec (execbit !)
   2 r4/.hg/cache/rbc-names-v1
   2 r4/.hg/cache/rbc-revs-v1
   2 r4/.hg/dirstate
   2 r4/.hg/fsmonitor.state (fsmonitor !)
   2 r4/.hg/hgrc
   2 r4/.hg/last-message.txt
   2 r4/.hg/requires
   2 r4/.hg/store/00changelog.i
   2 r4/.hg/store/00manifest.i
   2 r4/.hg/store/data/d1/f2.d
   2 r4/.hg/store/data/d1/f2.i
   2 r4/.hg/store/data/f1.i
   2 r4/.hg/store/data/f3.i
   2 r4/.hg/store/fncache (repofncache !)
   2 r4/.hg/store/phaseroots
   2 r4/.hg/store/undo
   2 r4/.hg/store/undo.backup.fncache (repofncache !)
   2 r4/.hg/store/undo.backup.phaseroots
   2 r4/.hg/store/undo.backupfiles
   2 r4/.hg/store/undo.phaseroots
   [24] r4/\.hg/undo\.backup\.dirstate (re)
   2 r4/.hg/undo.bookmarks
   2 r4/.hg/undo.branch
   2 r4/.hg/undo.desc
   [24] r4/\.hg/undo\.dirstate (re)
   2 r4/d1/data1
   2 r4/d1/f2
   2 r4/f1
   2 r4/f3
 
 Update back to revision 12 in r4 should break hardlink of file f1 and f3:
 #if hardlink-whitelisted
   $ nlinksdir r4/.hg/undo.backup.dirstate r4/.hg/undo.dirstate
   4 r4/.hg/undo.backup.dirstate
   4 r4/.hg/undo.dirstate
 #endif
 
 
   $ hg -R r4 up 12
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved (execbit !)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-execbit !)
 
   $ nlinksdir r4
   2 r4/.hg/00changelog.i
   1 r4/.hg/branch
   2 r4/.hg/cache/branch2-base
   2 r4/.hg/cache/branch2-served
   2 r4/.hg/cache/checkisexec (execbit !)
   2 r4/.hg/cache/checklink-target (symlink !)
   2 r4/.hg/cache/checknoexec (execbit !)
   2 r4/.hg/cache/rbc-names-v1
   2 r4/.hg/cache/rbc-revs-v1
   1 r4/.hg/dirstate
   1 r4/.hg/fsmonitor.state (fsmonitor !)
   2 r4/.hg/hgrc
   2 r4/.hg/last-message.txt
   2 r4/.hg/requires
   2 r4/.hg/store/00changelog.i
   2 r4/.hg/store/00manifest.i
   2 r4/.hg/store/data/d1/f2.d
   2 r4/.hg/store/data/d1/f2.i
   2 r4/.hg/store/data/f1.i
   2 r4/.hg/store/data/f3.i
   2 r4/.hg/store/fncache
   2 r4/.hg/store/phaseroots
   2 r4/.hg/store/undo
   2 r4/.hg/store/undo.backup.fncache (repofncache !)
   2 r4/.hg/store/undo.backup.phaseroots
   2 r4/.hg/store/undo.backupfiles
   2 r4/.hg/store/undo.phaseroots
   [24] r4/\.hg/undo\.backup\.dirstate (re)
   2 r4/.hg/undo.bookmarks
   2 r4/.hg/undo.branch
   2 r4/.hg/undo.desc
   [24] r4/\.hg/undo\.dirstate (re)
   2 r4/d1/data1
   2 r4/d1/f2
   1 r4/f1
   1 r4/f3 (execbit !)
   2 r4/f3 (no-execbit !)
 
 #if hardlink-whitelisted
   $ nlinksdir r4/.hg/undo.backup.dirstate r4/.hg/undo.dirstate
   4 r4/.hg/undo.backup.dirstate
   4 r4/.hg/undo.dirstate
 #endif
 
 Test hardlinking outside hg:
 
   $ mkdir x
   $ echo foo > x/a
 
   $ linkcp x y
   $ echo bar >> y/a
 
 No diff if hardlink:
 
   $ diff x/a y/a
 
 Test mq hardlinking:
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
   $ hg init a
   $ cd a
 
   $ hg qimport -n foo - << EOF
   > # HG changeset patch
   > # Date 1 0
   > diff -r 2588a8b53d66 a
   > --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   > +++ b/a	Wed Jul 23 15:54:29 2008 +0200
   > @@ -0,0 +1,1 @@
   > +a
   > EOF
   adding foo to series file
 
   $ hg qpush
   applying foo
   now at: foo
 
   $ cd ..
   $ linkcp a b
   $ cd b
 
   $ hg qimport -n bar - << EOF
   > # HG changeset patch
   > # Date 2 0
   > diff -r 2588a8b53d66 a
   > --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   > +++ b/b	Wed Jul 23 15:54:29 2008 +0200
   > @@ -0,0 +1,1 @@
   > +b
   > EOF
   adding bar to series file
 
   $ hg qpush
   applying bar
   now at: bar
 
   $ cat .hg/patches/status
   430ed4828a74fa4047bc816a25500f7472ab4bfe:foo
   4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c:bar
 
   $ cat .hg/patches/series
   foo
   bar
 
   $ cat ../a/.hg/patches/status
   430ed4828a74fa4047bc816a25500f7472ab4bfe:foo
 
   $ cat ../a/.hg/patches/series
   foo
 
 Test tags hardlinking:
 
   $ hg qdel -r qbase:qtip
   patch foo finalized without changeset message
   patch bar finalized without changeset message
 
   $ hg tag -l lfoo
   $ hg tag foo
 
   $ cd ..
   $ linkcp b c
   $ cd c
 
   $ hg tag -l -r 0 lbar
   $ hg tag -r 0 bar
 
   $ cat .hgtags
   4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo
   430ed4828a74fa4047bc816a25500f7472ab4bfe bar
 
   $ cat .hg/localtags
   4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo
   430ed4828a74fa4047bc816a25500f7472ab4bfe lbar
 
   $ cat ../b/.hgtags
   4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo
 
   $ cat ../b/.hg/localtags
   4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo
 
   $ cd ..

tests/test-import-merge.t

@@ -1,167 +1,167 b''
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
   $ tipparents() {
   > hg parents --template "{rev}:{node|short} {desc|firstline}\n" -r tip
   > }
 
 Test import and merge diffs
 
   $ hg init repo
   $ cd repo
   $ echo a > a
   $ hg ci -Am adda
   adding a
   $ echo a >> a
   $ hg ci -m changea
   $ echo c > c
   $ hg ci -Am addc
   adding c
   $ hg up 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b > b
   $ hg ci -Am addb
   adding b
   created new head
   $ hg up 1
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m merge
   $ hg export . > ../merge.diff
   $ grep -v '^merge$' ../merge.diff > ../merge.nomsg.diff
   $ cd ..
   $ hg clone -r2 repo repo2
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 2 files
   new changesets 07f494440405:890ecaa90481
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd repo2
   $ hg pull -r3 ../repo
   pulling from ../repo
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets 102a90ea7b4a
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Test without --exact and diff.p1 == workingdir.p1
 
   $ hg up 1
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cat > $TESTTMP/editor.sh <<EOF
   > env | grep HGEDITFORM
   > echo merge > \$1
   > EOF
   $ HGEDITOR="sh $TESTTMP/editor.sh" hg import --edit ../merge.nomsg.diff
   applying ../merge.nomsg.diff
   HGEDITFORM=import.normal.merge
   $ tipparents
   1:540395c44225 changea
   3:102a90ea7b4a addb
   $ hg strip --no-backup tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Test without --exact and diff.p1 != workingdir.p1
 
   $ hg up 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg import ../merge.diff
   applying ../merge.diff
   warning: import the patch as a normal revision
   (use --exact to import the patch as a merge)
   $ tipparents
   2:890ecaa90481 addc
   $ hg strip --no-backup tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Test with --exact
 
   $ hg import --exact ../merge.diff
   applying ../merge.diff
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ tipparents
   1:540395c44225 changea
   3:102a90ea7b4a addb
   $ hg strip --no-backup tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Test with --bypass and diff.p1 == workingdir.p1
 
   $ hg up 1
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg import --bypass ../merge.diff
   applying ../merge.diff
   $ tipparents
   1:540395c44225 changea
   3:102a90ea7b4a addb
   $ hg strip --no-backup tip
 
 Test with --bypass and diff.p1 != workingdir.p1
 
   $ hg up 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg import --bypass ../merge.diff
   applying ../merge.diff
   warning: import the patch as a normal revision
   (use --exact to import the patch as a merge)
   $ tipparents
   2:890ecaa90481 addc
   $ hg strip --no-backup tip
 
 Test with --bypass and --exact
 
   $ hg import --bypass --exact ../merge.diff
   applying ../merge.diff
   $ tipparents
   1:540395c44225 changea
   3:102a90ea7b4a addb
   $ hg strip --no-backup tip
 
   $ cd ..
 
 Test that --exact on a bad header doesn't corrupt the repo (issue3616)
 
   $ hg init repo3
   $ cd repo3
   $ echo a>a
   $ hg ci -Aqm0
   $ echo a>>a
   $ hg ci -m1
   $ echo a>>a
   $ hg ci -m2
   $ echo a>a
   $ echo b>>a
   $ echo a>>a
   $ hg ci -m3
   $ hg export 2 | head -7 > ../a.patch
   $ hg export tip > out
   >>> apatch = open("../a.patch", "ab")
-  >>> apatch.write("".join(open("out").readlines()[7:]))
+  >>> apatch.write(b"".join(open("out", 'rb').readlines()[7:])) and None
 
   $ cd ..
   $ hg clone -qr0 repo3 repo3-clone
   $ cd repo3-clone
   $ hg pull -qr1 ../repo3
 
   $ hg import --exact ../a.patch
   applying ../a.patch
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   patching file a
   Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
   transaction abort!
   rollback completed
   abort: patch is damaged or loses information
   [255]
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 2 changesets, 2 total revisions

tests/test-revert-interactive.t

@@ -1,432 +1,432 b''
 Revert interactive tests
 1 add and commit file f
 2 add commit file folder1/g
 3 add and commit file folder2/h
 4 add and commit file folder1/i
 5 commit change to file f
 6 commit changes to files folder1/g folder2/h
 7 commit changes to files folder1/g folder2/h
 8 revert interactive to commit id 2 (line 3 above), check that folder1/i is removed and
 9 make workdir match 7
 10 run the same test than 8 from within folder1 and check same expectations
 
   $ cat <<EOF >> $HGRCPATH
   > [ui]
   > interactive = true
   > [extensions]
   > record =
   > purge = 
   > EOF
 
 
   $ mkdir -p a/folder1 a/folder2
   $ cd a
   $ 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"
   $ 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 > 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"
-  >>> 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"
-  >>> 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 tip
   changeset:   6:59dd6e4ab63a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     modifying folder2/h
   
   $ hg revert -i -r 2 --all -- << EOF
   > y
   > y
   > y
   > y
   > y
   > ?
   > y
   > n
   > n
   > EOF
   reverting f
   reverting folder1/g
   removing folder1/i
   reverting folder2/h
   remove added file folder1/i (Yn)? y
   diff --git a/f b/f
   2 hunks, 2 lines changed
   examine changes to 'f'? [Ynesfdaq?] y
   
   @@ -1,6 +1,5 @@
   -a
    1
    2
    3
    4
    5
   apply change 1/6 to 'f'? [Ynesfdaq?] y
   
   @@ -2,6 +1,5 @@
    1
    2
    3
    4
    5
   -b
   apply change 2/6 to 'f'? [Ynesfdaq?] y
   
   diff --git a/folder1/g b/folder1/g
   2 hunks, 2 lines changed
   examine changes to 'folder1/g'? [Ynesfdaq?] y
   
   @@ -1,6 +1,5 @@
   -c
    1
    2
    3
    4
    5
   apply change 3/6 to 'folder1/g'? [Ynesfdaq?] ?
   
   y - yes, apply this change
   n - no, skip this change
   e - edit this change manually
   s - skip remaining changes to this file
   f - apply remaining changes to this file
   d - done, skip remaining changes and files
   a - apply all changes to all remaining files
   q - quit, applying no changes
   ? - ? (display help)
   apply change 3/6 to 'folder1/g'? [Ynesfdaq?] y
   
   @@ -2,6 +1,5 @@
    1
    2
    3
    4
    5
   -d
   apply change 4/6 to 'folder1/g'? [Ynesfdaq?] n
   
   diff --git a/folder2/h b/folder2/h
   2 hunks, 2 lines changed
   examine changes to 'folder2/h'? [Ynesfdaq?] n
   
   $ cat f
   1
   2
   3
   4
   5
   $ cat folder1/g
   1
   2
   3
   4
   5
   d
   $ cat folder2/h
   e
   1
   2
   3
   4
   5
   f
 
 Test that --interactive lift the need for --all
 
   $ echo q | hg revert -i -r 2
   reverting folder1/g
   reverting folder2/h
   diff --git a/folder1/g b/folder1/g
   1 hunks, 1 lines changed
   examine changes to 'folder1/g'? [Ynesfdaq?] q
   
   abort: user quit
   [255]
   $ ls folder1/
   g
 
 Test that a noop revert doesn't do an unnecessary backup
   $ (echo y; echo n) | hg revert -i -r 2 folder1/g
   diff --git a/folder1/g b/folder1/g
   1 hunks, 1 lines changed
   examine changes to 'folder1/g'? [Ynesfdaq?] y
   
   @@ -3,4 +3,3 @@
    3
    4
    5
   -d
   apply this change to 'folder1/g'? [Ynesfdaq?] n
   
   $ ls folder1/
   g
 
 Test --no-backup
   $ (echo y; echo y) | hg revert -i -C -r 2 folder1/g
   diff --git a/folder1/g b/folder1/g
   1 hunks, 1 lines changed
   examine changes to 'folder1/g'? [Ynesfdaq?] y
   
   @@ -3,4 +3,3 @@
    3
    4
    5
   -d
   apply this change to 'folder1/g'? [Ynesfdaq?] y
   
   $ ls folder1/
   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
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg revert -i -r 2 --all -- << EOF
   > n
   > y
   > y
   > y
   > y
   > y
   > n
   > n
   > EOF
   reverting f
   reverting folder1/g
   removing folder1/i
   reverting folder2/h
   remove added file folder1/i (Yn)? n
   diff --git a/f b/f
   2 hunks, 2 lines changed
   examine changes to 'f'? [Ynesfdaq?] y
   
   @@ -1,6 +1,5 @@
   -a
    1
    2
    3
    4
    5
   apply change 1/6 to 'f'? [Ynesfdaq?] y
   
   @@ -2,6 +1,5 @@
    1
    2
    3
    4
    5
   -b
   apply change 2/6 to 'f'? [Ynesfdaq?] y
   
   diff --git a/folder1/g b/folder1/g
   2 hunks, 2 lines changed
   examine changes to 'folder1/g'? [Ynesfdaq?] y
   
   @@ -1,6 +1,5 @@
   -c
    1
    2
    3
    4
    5
   apply change 3/6 to 'folder1/g'? [Ynesfdaq?] y
   
   @@ -2,6 +1,5 @@
    1
    2
    3
    4
    5
   -d
   apply change 4/6 to 'folder1/g'? [Ynesfdaq?] n
   
   diff --git a/folder2/h b/folder2/h
   2 hunks, 2 lines changed
   examine changes to 'folder2/h'? [Ynesfdaq?] n
   
   $ cat f
   1
   2
   3
   4
   5
   $ cat folder1/g
   1
   2
   3
   4
   5
   d
   $ cat folder2/h
   e
   1
   2
   3
   4
   5
   f
   $ hg st
   M f
   M folder1/g
   $ hg revert --interactive f << EOF
   > y
   > ?
   > y
   > n
   > n
   > EOF
   diff --git a/f b/f
   2 hunks, 2 lines changed
   examine changes to 'f'? [Ynesfdaq?] y
   
   @@ -1,6 +1,5 @@
   -a
    1
    2
    3
    4
    5
   discard change 1/2 to 'f'? [Ynesfdaq?] ?
   
   y - yes, discard this change
   n - no, skip this change
   e - edit this change manually
   s - skip remaining changes to this file
   f - discard remaining changes to this file
   d - done, skip remaining changes and files
   a - discard all changes to all remaining files
   q - quit, discarding no changes
   ? - ? (display help)
   discard change 1/2 to 'f'? [Ynesfdaq?] y
   
   @@ -2,6 +1,5 @@
    1
    2
    3
    4
    5
   -b
   discard change 2/2 to 'f'? [Ynesfdaq?] n
   
   $ hg st
   M f
   M folder1/g
   ? f.orig
   $ cat f
   a
   1
   2
   3
   4
   5
   $ cat f.orig
   1
   2
   3
   4
   5
   $ rm f.orig
   $ hg update -C .
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Check editing files newly added by a revert
 
 1) Create a dummy editor changing 1 to 42
   $ cat > $TESTTMP/editor.sh << '__EOF__'
   > cat "$1"  | sed "s/1/42/g"  > tt
   > mv tt  "$1"
   > __EOF__
 
 2) Add k
   $ printf "1\n" > k
   $ hg add k
   $ hg commit -m "add k"
 
 3) Use interactive revert with editing (replacing +1 with +42):
   $ printf "0\n2\n" > k
   $ HGEDITOR="\"sh\" \"${TESTTMP}/editor.sh\"" hg revert -i  <<EOF
   > y
   > e
   > EOF
   reverting k
   diff --git a/k b/k
   1 hunks, 2 lines changed
   examine changes to 'k'? [Ynesfdaq?] y
   
   @@ -1,1 +1,2 @@
   -1
   +0
   +2
   discard this change to 'k'? [Ynesfdaq?] e
   
   $ cat k
   42
 
   $ hg update -C .
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg purge
   $ touch newfile
   $ hg add newfile
   $ hg status
   A newfile
   $ hg revert -i <<EOF
   > n
   > EOF
   forgetting newfile
   forget added file newfile (Yn)? n
   $ hg status
   A newfile
   $ hg revert -i <<EOF
   > y
   > EOF
   forgetting newfile
   forget added file newfile (Yn)? y
   $ hg status
   ? newfile
 
 When a line without EOL is selected during "revert -i" (issue5651)
 
   $ hg init $TESTTMP/revert-i-eol
   $ cd $TESTTMP/revert-i-eol
   $ echo 0 > a
   $ hg ci -qAm 0
   $ printf 1 >> a
   $ hg ci -qAm 1
   $ cat a
   0
   1 (no-eol)
 
   $ hg revert -ir'.^' <<EOF
   > y
   > y
   > EOF
   reverting a
   diff --git a/a b/a
   1 hunks, 1 lines changed
   examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -1,2 +1,1 @@
    0
   -1
   \ No newline at end of file
   apply this change to 'a'? [Ynesfdaq?] y
   
   $ cat a
   0
 
 When specified pattern does not exist, we should exit early (issue5789).
 
   $ hg files
   a
   $ hg rev b
   b: no such file in rev b40d1912accf
   $ hg rev -i b
   b: no such file in rev b40d1912accf
 
   $ cd ..