Mercurial > public > mercurial-scm > python-hglib
view hglib/merge.py @ 101:d1a42c1d0b61
tests: hook into hgclient.open for closing open cmdservers
So we ensure proper cleanup and cover all top level functions.
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Wed, 18 Jan 2012 00:39:24 +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'