Mercurial > public > mercurial-scm > python-hglib
view hglib/merge.py @ 126:a7fe976b1931
context: add 'phase' getter
This method must be dynamic as the phase can change during the lifetime of the
changeset.
author | Paul Tonelli <paul.tonelli@logilab.fr> |
---|---|
date | Wed, 21 May 2014 12:25:30 +0200 |
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'