equal
deleted
inserted
replaced
418 HGTMP = os.environ['HGTMP'] = tempfile.mkdtemp('', 'hgtests.', options.tmpdir) |
418 HGTMP = os.environ['HGTMP'] = tempfile.mkdtemp('', 'hgtests.', options.tmpdir) |
419 DAEMON_PIDS = None |
419 DAEMON_PIDS = None |
420 HGRCPATH = None |
420 HGRCPATH = None |
421 |
421 |
422 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' |
422 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' |
423 os.environ["HGMERGE"] = ('python "%s" -L my -L other' |
423 os.environ["HGMERGE"] = "internal:merge" |
424 % os.path.join(TESTDIR, os.path.pardir, |
|
425 'contrib', 'simplemerge')) |
|
426 os.environ["HGUSER"] = "test" |
424 os.environ["HGUSER"] = "test" |
427 os.environ["HGENCODING"] = "ascii" |
425 os.environ["HGENCODING"] = "ascii" |
428 os.environ["HGENCODINGMODE"] = "strict" |
426 os.environ["HGENCODINGMODE"] = "strict" |
429 os.environ["HGPORT"] = str(options.port) |
427 os.environ["HGPORT"] = str(options.port) |
430 os.environ["HGPORT1"] = str(options.port + 1) |
428 os.environ["HGPORT1"] = str(options.port + 1) |