equal
deleted
inserted
replaced
1076 env["HGRCPATH"] = _strpath(os.path.join(self._threadtmp, b'.hgrc')) |
1076 env["HGRCPATH"] = _strpath(os.path.join(self._threadtmp, b'.hgrc')) |
1077 env["DAEMON_PIDS"] = _strpath(os.path.join(self._threadtmp, |
1077 env["DAEMON_PIDS"] = _strpath(os.path.join(self._threadtmp, |
1078 b'daemon.pids')) |
1078 b'daemon.pids')) |
1079 env["HGEDITOR"] = ('"' + sys.executable + '"' |
1079 env["HGEDITOR"] = ('"' + sys.executable + '"' |
1080 + ' -c "import sys; sys.exit(0)"') |
1080 + ' -c "import sys; sys.exit(0)"') |
1081 env["HGMERGE"] = "internal:merge" |
|
1082 env["HGUSER"] = "test" |
1081 env["HGUSER"] = "test" |
1083 env["HGENCODING"] = "ascii" |
1082 env["HGENCODING"] = "ascii" |
1084 env["HGENCODINGMODE"] = "strict" |
1083 env["HGENCODINGMODE"] = "strict" |
1085 env["HGHOSTNAME"] = "test-hostname" |
1084 env["HGHOSTNAME"] = "test-hostname" |
1086 env['HGIPV6'] = str(int(self._useipv6)) |
1085 env['HGIPV6'] = str(int(self._useipv6)) |
1114 'CDPATH', |
1113 'CDPATH', |
1115 'CHGDEBUG', |
1114 'CHGDEBUG', |
1116 'EDITOR', |
1115 'EDITOR', |
1117 'GREP_OPTIONS', |
1116 'GREP_OPTIONS', |
1118 'HG', |
1117 'HG', |
|
1118 'HGMERGE', |
1119 'HGPLAIN', |
1119 'HGPLAIN', |
1120 'HGPLAINEXCEPT', |
1120 'HGPLAINEXCEPT', |
1121 'HGPROF', |
1121 'HGPROF', |
1122 'http_proxy', |
1122 'http_proxy', |
1123 'no_proxy', |
1123 'no_proxy', |
1144 """Create an hgrc file for this test.""" |
1144 """Create an hgrc file for this test.""" |
1145 with open(path, 'wb') as hgrc: |
1145 with open(path, 'wb') as hgrc: |
1146 hgrc.write(b'[ui]\n') |
1146 hgrc.write(b'[ui]\n') |
1147 hgrc.write(b'slash = True\n') |
1147 hgrc.write(b'slash = True\n') |
1148 hgrc.write(b'interactive = False\n') |
1148 hgrc.write(b'interactive = False\n') |
|
1149 hgrc.write(b'merge = internal:merge\n') |
1149 hgrc.write(b'mergemarkers = detailed\n') |
1150 hgrc.write(b'mergemarkers = detailed\n') |
1150 hgrc.write(b'promptecho = True\n') |
1151 hgrc.write(b'promptecho = True\n') |
1151 hgrc.write(b'[defaults]\n') |
1152 hgrc.write(b'[defaults]\n') |
1152 hgrc.write(b'[devel]\n') |
1153 hgrc.write(b'[devel]\n') |
1153 hgrc.write(b'all-warnings = true\n') |
1154 hgrc.write(b'all-warnings = true\n') |