Mercurial > public > mercurial-scm > python-hglib

annotate hglib/merge.py @ 104:6e423f7c784f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ancestor: fix incorrect reference to 'n2'
author Francisco Figueirido <francisco@giantclam.net>
date Thu, 01 Mar 2012 23:16:07 -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'