tests/heredoctest.py

merge: introduce mergeresult.addfile() and use it

We want to use mergeresult object at more and more places instead of this
actions dict to simplify code and further add new APIs to mergeresult object.

This patch introduces `addfile()` which adds a new file to the internal actions
dict for now.

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

from __future__ import absolute_import, print_function

import sys


def flush():
    sys.stdout.flush()
    sys.stderr.flush()


globalvars = {}
lines = sys.stdin.readlines()
while lines:
    l = lines.pop(0)
    if l.startswith('SALT'):
        print(l[:-1])
    elif l.startswith('>>> '):
        snippet = l[4:]
        while lines and lines[0].startswith('... '):
            l = lines.pop(0)
            snippet += l[4:]
        c = compile(snippet, '<heredoc>', 'single')
        try:
            flush()
            exec(c, globalvars)
            flush()
        except Exception as inst:
            flush()
            print(repr(inst))