view hglib/merge.py @ 201:67398bbf788d 2.6

client: do not accept NULL character as command arguments It would break the data structure, and it's also invalid as a shell command.
author Yuya Nishihara <yuya@tcha.org>
date Wed, 25 Apr 2018 21:27:02 +0900
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'