view hglib/merge.py @ 121:cc905ee18449

Added tag 1.2 for changeset 5d3783aebe5f
author Matt Mackall <mpm@selenic.com>
date Sat, 01 Feb 2014 15:30:18 -0600
parents ebcc5d7dd528
children fe74d5599539
line wrap: on
line source

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 ''

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