Mercurial > public > mercurial-scm > python-hglib

annotate hglib/merge.py @ 141:ea80bd2775f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hglib: introduce util.b() (issue4520) The util.b() function will be used to mark all string literals in the code base which should be treated as bytes instead of text. This is to help with supporting Python 3.
author Brett Cannon <brett@python.org>
date Sat, 07 Mar 2015 10:08:52 -0500
parents ebcc5d7dd528
children fe74d5599539
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
46
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
1 class handlers(object):
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
2 """
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
3 These can be used as the cb argument to hgclient.merge() to control the
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
4 behaviour when Mercurial prompts what to do with regard to a specific file,
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
5 e.g. when one parent modified a file and the other removed it.
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
6 """
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
7
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
8 @staticmethod
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
9 def abort(size, output):
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
10 """
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
11 Abort the merge if a prompt appears.
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
12 """
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
13 return ''
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
14
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
15 """
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
16 This corresponds to Mercurial's -y/--noninteractive global option, which
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
17 picks the first choice on all prompts.
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
18 """
ebcc5d7dd528 client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
19 noninteractive = 'yes'