blob: 88bc99d9933ee3aeb68cc78f68b252e7f0d16385 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
|
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'
|
