forked from mirrors/gecko-dev
--HG-- rename : third_party/python/hglib/LICENSE => third_party/python/python-hglib/LICENSE rename : third_party/python/hglib/hglib/__init__.py => third_party/python/python-hglib/hglib/__init__.py rename : third_party/python/hglib/hglib/client.py => third_party/python/python-hglib/hglib/client.py rename : third_party/python/hglib/hglib/context.py => third_party/python/python-hglib/hglib/context.py rename : third_party/python/hglib/hglib/error.py => third_party/python/python-hglib/hglib/error.py rename : third_party/python/hglib/hglib/merge.py => third_party/python/python-hglib/hglib/merge.py rename : third_party/python/hglib/hglib/templates.py => third_party/python/python-hglib/hglib/templates.py rename : third_party/python/hglib/hglib/util.py => third_party/python/python-hglib/hglib/util.py rename : third_party/python/hglib/setup.py => third_party/python/python-hglib/setup.py extra : rebase_source : 552d93c9e90c04171c8b627c8f4f4fa5ec506cc3
21 lines
591 B
Python
21 lines
591 B
Python
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'
|