Mercurial > python-hglib
annotate hglib/merge.py @ 180:ff6efc1ab9e4
protocol: allow hglib user to get call backs for prompts, output and errors
setcbout(cbout), setcberr(cberr) and setcbprompt(cbprompt) are used to
set the call back function used by the hgclient class. cb stands for
call back.
cbout is a function that will be called with the stdout data of the
command as it runs. cbout is called with output as it is made available,
which can be as partial lines or multiple lines.
cberr is a function that will be called with the stderr data of the
command as it runs. cberr is called with output as it is made available,
which can be as partial lines or multiple lines.
Command that make remote connects can prompt for username and password
for HTTP/HTTPS connections.
cbprompt is called when hgclient need a response to a prompt from the
server. It receives the max number of bytes to return and the contents
of stdout received so far. The last text sent to either cbout or cberr
will contain the prompt text itself.
author | Barry A. Scott <barry@barrys-emacs.org> |
---|---|
date | Fri, 28 Oct 2016 11:33:20 +0100 |
parents | fe74d5599539 |
children |
rev | line source |
---|---|
142
fe74d5599539
hglib: wrap all application string literals in util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
46
diff
changeset
|
1 from hglib.util import b |
fe74d5599539
hglib: wrap all application string literals in util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
46
diff
changeset
|
2 |
46
ebcc5d7dd528
client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
3 class handlers(object): |
ebcc5d7dd528
client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
4 """ |
ebcc5d7dd528
client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
5 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
|
6 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
|
7 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
|
8 """ |
ebcc5d7dd528
client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
9 |
ebcc5d7dd528
client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
10 @staticmethod |
ebcc5d7dd528
client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
11 def abort(size, output): |
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 Abort the merge if a prompt appears. |
ebcc5d7dd528
client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
14 """ |
142
fe74d5599539
hglib: wrap all application string literals in util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
46
diff
changeset
|
15 return b('') |
46
ebcc5d7dd528
client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
16 |
ebcc5d7dd528
client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
17 """ |
ebcc5d7dd528
client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
18 This corresponds to Mercurial's -y/--noninteractive global option, which |
ebcc5d7dd528
client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
19 picks the first choice on all prompts. |
ebcc5d7dd528
client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
20 """ |
ebcc5d7dd528
client: introduce merge handlers
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
21 noninteractive = 'yes' |