Mercurial > public > mercurial-scm > python-hglib
view hglib/merge.py @ 169:e6589149b2c8 1.9
client: include stderr message in ServerError on initial communication failure
If _readhello() raises ServerError, the server must be unusable. So we can
terminate it to get status code and error message.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Mon, 07 Sep 2015 22:45:47 +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'