##// END OF EJS Templates
resolve: fix incorrect merge...
resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

File last commit:

r25032:1db2127d default
r27025:ec372573 default
Show More
heredoctest.py
18 lines | 470 B | text/x-python | PythonLexer
Matt Mackall
run-tests: replace inline python handling with more native scheme...
r15434 import sys
Idan Kamara
tests: remove temp doctest file when finished running it
r15247
Matt Mackall
run-tests: replace inline python handling with more native scheme...
r15434 globalvars = {}
lines = sys.stdin.readlines()
while lines:
l = lines.pop(0)
if l.startswith('SALT'):
Augie Fackler
heredoctest: 2to3 -w -f numliterals -f except -f print tests/heredoctest.py
r25032 print(l[:-1])
Matt Mackall
run-tests: replace inline python handling with more native scheme...
r15434 elif l.startswith('>>> '):
snippet = l[4:]
while lines and lines[0].startswith('... '):
l = lines.pop(0)
Yuya Nishihara
heredoctest: do not append extra newline character to continuation line...
r22565 snippet += l[4:]
Matt Mackall
run-tests: replace inline python handling with more native scheme...
r15434 c = compile(snippet, '<heredoc>', 'single')
try:
Augie Fackler
heredoctest: 2to3 -w -f numliterals -f except -f print tests/heredoctest.py
r25032 exec(c, globalvars)
except Exception as inst:
print(repr(inst))