Mercurial > public > mercurial-scm > python-hglib
view hglib/merge.py @ 158:2104fc9aa513
util: make cmdbuilder work with bytes (issue4520)
author | Brett Cannon <brett@python.org> |
---|---|
date | Fri, 27 Mar 2015 10:45:26 -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'