view hglib/merge.py @ 118:e738d6fe5f3f 1.1

tests: make the tests work under Pypy (issue3965) ..which needs explicit close() due to lack of reference counting.
author Matt Mackall <mpm@selenic.com>
date Sun, 23 Jun 2013 17:52:16 -0500
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'