py3: encode sys.argv to bytes using .encode()

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

tests/test-import-context.t

@@ -1,126 +1,126 b''
 Test applying context diffs
 
   $ cat > writepatterns.py <<EOF
   > import sys
   > 
   > path = sys.argv[1]
   > lasteol = sys.argv[2] == '1'
   > patterns = sys.argv[3:]
   > 
   > fp = open(path, 'wb')
   > for i, pattern in enumerate(patterns):
   >     count = int(pattern[0:-1])
-  >     char = pattern[-1] + '\n'
+  >     char = pattern[-1].encode('utf8') + b'\n'
   >     if not lasteol and i == len(patterns) - 1:
   >         fp.write((char*count)[:-1])
   >     else:
   >         fp.write(char*count)
   > fp.close()
   > EOF
   $ cat > cat.py <<EOF
   > import sys
   > sys.stdout.write(repr(open(sys.argv[1], 'rb').read()) + '\n')
   > EOF
 
 Initialize the test repository
 
   $ hg init repo
   $ cd repo
   $ $PYTHON ../writepatterns.py a 0 5A 1B 5C 1D
   $ $PYTHON ../writepatterns.py b 1 1A 1B
   $ $PYTHON ../writepatterns.py c 1 5A
   $ $PYTHON ../writepatterns.py d 1 5A 1B
   $ hg add
   adding a
   adding b
   adding c
   adding d
   $ hg ci -m addfiles
 
 Add file, missing a last end of line
 
   $ hg import --no-commit - <<EOF
   > *** /dev/null	2010-10-16 18:05:49.000000000 +0200
   > --- b/newnoeol	2010-10-16 18:23:26.000000000 +0200
   > ***************
   > *** 0 ****
   > --- 1,2 ----
   > + a
   > + b
   > \ No newline at end of file
   > *** a/a	Sat Oct 16 16:35:51 2010
   > --- b/a	Sat Oct 16 16:35:51 2010
   > ***************
   > *** 3,12 ****
   >   A
   >   A
   >   A
   > ! B
   >   C
   >   C
   >   C
   >   C
   >   C
   > ! D
   > \ No newline at end of file
   > --- 3,13 ----
   >   A
   >   A
   >   A
   > ! E
   >   C
   >   C
   >   C
   >   C
   >   C
   > ! F
   > ! F
   > 
   > *** a/b	2010-10-16 18:40:38.000000000 +0200
   > --- /dev/null	2010-10-16 18:05:49.000000000 +0200
   > ***************
   > *** 1,2 ****
   > - A
   > - B
   > --- 0 ----
   > *** a/c	Sat Oct 16 21:34:26 2010
   > --- b/c	Sat Oct 16 21:34:27 2010
   > ***************
   > *** 3,5 ****
   > --- 3,7 ----
   >   A
   >   A
   >   A
   > + B
   > + B
   > *** a/d	Sat Oct 16 21:47:20 2010
   > --- b/d	Sat Oct 16 21:47:22 2010
   > ***************
   > *** 2,6 ****
   >   A
   >   A
   >   A
   > - A
   > - B
   > --- 2,4 ----
   > EOF
   applying patch from stdin
   $ hg st
   M a
   M c
   M d
   A newnoeol
   R b
 
 What's in a
 
   $ $PYTHON ../cat.py a
   'A\nA\nA\nA\nA\nE\nC\nC\nC\nC\nC\nF\nF\n'
   $ $PYTHON ../cat.py newnoeol
   'a\nb'
   $ $PYTHON ../cat.py c
   'A\nA\nA\nA\nA\nB\nB\n'
   $ $PYTHON ../cat.py d
   'A\nA\nA\nA\n'
 
   $ cd ..

tests/test-patch-offset.t

@@ -1,82 +1,82 b''
 
   $ cat > writepatterns.py <<EOF
   > import sys
   > 
   > path = sys.argv[1]
   > patterns = sys.argv[2:]
   > 
   > fp = open(path, 'wb')
   > for pattern in patterns:
   >     count = int(pattern[0:-1])
-  >     char = pattern[-1] + '\n'
+  >     char = pattern[-1].encode('utf8') + b'\n'
   >     fp.write(char*count)
   > fp.close()
   > EOF
 
 prepare repo
 
   $ hg init a
   $ cd a
 
 These initial lines of Xs were not in the original file used to generate
 the patch.  So all the patch hunks need to be applied to a constant offset
 within this file.  If the offset isn't tracked then the hunks can be
 applied to the wrong lines of this file.
 
   $ $PYTHON ../writepatterns.py a 34X 10A 1B 10A 1C 10A 1B 10A 1D 10A 1B 10A 1E 10A 1B 10A
   $ hg commit -Am adda
   adding a
 
 This is a cleaner patch generated via diff
 In this case it reproduces the problem when
 the output of hg export does not
 import patch
 
   $ hg import -v -m 'b' -d '2 0' - <<EOF
   > --- a/a	2009-12-08 19:26:17.000000000 -0800
   > +++ b/a	2009-12-08 19:26:17.000000000 -0800
   > @@ -9,7 +9,7 @@
   >  A
   >  A
   >  B
   > -A
   > +a
   >  A
   >  A
   >  A
   > @@ -53,7 +53,7 @@
   >  A
   >  A
   >  B
   > -A
   > +a
   >  A
   >  A
   >  A
   > @@ -75,7 +75,7 @@
   >  A
   >  A
   >  B
   > -A
   > +a
   >  A
   >  A
   >  A
   > EOF
   applying patch from stdin
   patching file a
   Hunk #1 succeeded at 43 (offset 34 lines).
   Hunk #2 succeeded at 87 (offset 34 lines).
   Hunk #3 succeeded at 109 (offset 34 lines).
   committing files:
   a
   committing manifest
   committing changelog
   created 189885cecb41
 
 compare imported changes against reference file
 
   $ $PYTHON ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A
   $ diff aref a
 
   $ cd ..