Mercurial > python-hglib
annotate hglib/merge.py @ 90:b894c2222dff
client: replace usage of namedtuple for python 2.4 compatibility
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Thu, 22 Dec 2011 19:12:39 +0200 |
parents | ebcc5d7dd528 |
children | fe74d5599539 |
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' |