view hglib/merge.py @ 149:958307b30af3

hglib: add a __bool__ method where __nonzero__ is defined (issue4520) Python 3 uses the __bool__ magic method for determining the boolean value of an object instead of __nonzero__.
author Brett Cannon <brett@python.org>
date Mon, 16 Mar 2015 17:59:27 -0400
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'