Mercurial > hg
comparison tests/test-merge1.t @ 33721:24849d53697d
tests: clean up many print statements to be print functions instead
Differential Revision: https://phab.mercurial-scm.org/D294
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Thu, 15 Jun 2017 14:22:25 -0400 |
| parents | 2428e8ec0793 |
| children | 06a740540ea1 |
comparison
equal
deleted
inserted
replaced
| 33720:27fb986e54d0 | 33721:24849d53697d |
|---|---|
| 1 $ cat <<EOF > merge | 1 $ cat <<EOF > merge |
| 2 > from __future__ import print_function | |
| 2 > import sys, os | 3 > import sys, os |
| 3 > | 4 > |
| 4 > try: | 5 > try: |
| 5 > import msvcrt | 6 > import msvcrt |
| 6 > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) | 7 > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) |
| 7 > msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) | 8 > msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) |
| 8 > except ImportError: | 9 > except ImportError: |
| 9 > pass | 10 > pass |
| 10 > | 11 > |
| 11 > print "merging for", os.path.basename(sys.argv[1]) | 12 > print("merging for", os.path.basename(sys.argv[1])) |
| 12 > EOF | 13 > EOF |
| 13 $ HGMERGE="$PYTHON ../merge"; export HGMERGE | 14 $ HGMERGE="$PYTHON ../merge"; export HGMERGE |
| 14 | 15 |
| 15 $ hg init t | 16 $ hg init t |
| 16 $ cd t | 17 $ cd t |