view hglib/merge.py @ 178:77a5fded9f45

init: add init() to hgclient to allow progress to be reported The init() command is required as a member of hgclient so that progress, output and errors from the init() command can be sent to cbout and cberr call backs.
author Barry A. Scott <barry@barrys-emacs.org>
date Fri, 28 Oct 2016 11:45:57 +0100
parents fe74d5599539
children
line wrap: on
line source

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'