view hglib/merge.py @ 179:c4c0efb37187

protocol: add the abilty to trace the protocol between the client and server

This is useful when debugging issues with driving hg via hglib
where output and error messages can be lost.

Call setprotocoltrace with the name of a trace function or None.
If the trace function is None no tracing is done.

The trace function is called with the direction, the channel-identified
and its data.

from hglib.util import b

class handlers(object):
    """
    These can be used as the cb argument to hgclient.merge() to control the
    behaviour when Mercurial prompts what to do with regard to a specific file,
    e.g. when one parent modified a file and the other removed it.
    """

    @staticmethod
    def abort(size, output):
        """
        Abort the merge if a prompt appears.
        """
        return b('')

    """
    This corresponds to Mercurial's -y/--noninteractive global option, which
    picks the first choice on all prompts.
    """
    noninteractive = 'yes'