Mercurial > public > mercurial-scm > python-hglib
comparison hglib/merge.py @ 46:ebcc5d7dd528
client: introduce merge handlers
These can control the behaviour when Mercurial prompts what to do with regard
to a specific file
| author | Idan Kamara <idankk86@gmail.com> |
|---|---|
| date | Tue, 16 Aug 2011 23:58:24 +0300 |
| parents | |
| children | fe74d5599539 |
comparison
equal
deleted
inserted
replaced
| 45:191855a9d813 | 46:ebcc5d7dd528 |
|---|---|
| 1 class handlers(object): | |
| 2 """ | |
| 3 These can be used as the cb argument to hgclient.merge() to control the | |
| 4 behaviour when Mercurial prompts what to do with regard to a specific file, | |
| 5 e.g. when one parent modified a file and the other removed it. | |
| 6 """ | |
| 7 | |
| 8 @staticmethod | |
| 9 def abort(size, output): | |
| 10 """ | |
| 11 Abort the merge if a prompt appears. | |
| 12 """ | |
| 13 return '' | |
| 14 | |
| 15 """ | |
| 16 This corresponds to Mercurial's -y/--noninteractive global option, which | |
| 17 picks the first choice on all prompts. | |
| 18 """ | |
| 19 noninteractive = 'yes' |