equal
deleted
inserted
replaced
4 # GNU General Public License version 2 or any later version. |
4 # GNU General Public License version 2 or any later version. |
5 |
5 |
6 from __future__ import absolute_import |
6 from __future__ import absolute_import |
7 |
7 |
8 from mercurial.i18n import _ |
8 from mercurial.i18n import _ |
|
9 from mercurial.node import hex |
9 |
10 |
10 from mercurial import ( |
11 from mercurial import ( |
11 bundle2, |
12 bundle2, |
12 changegroup, |
13 changegroup, |
13 error, |
14 error, |
14 extensions, |
15 extensions, |
15 node as nodemod, |
|
16 pycompat, |
16 pycompat, |
17 revsetlang, |
17 revsetlang, |
18 util, |
18 util, |
19 ) |
19 ) |
20 |
20 |
52 params[b'bookmark'] = bookmark |
52 params[b'bookmark'] = bookmark |
53 # 'prevbooknode' is necessary for pushkey reply part |
53 # 'prevbooknode' is necessary for pushkey reply part |
54 params[b'bookprevnode'] = b'' |
54 params[b'bookprevnode'] = b'' |
55 bookmarks = repo._bookmarks |
55 bookmarks = repo._bookmarks |
56 if bookmark in bookmarks: |
56 if bookmark in bookmarks: |
57 params[b'bookprevnode'] = nodemod.hex(bookmarks[bookmark]) |
57 params[b'bookprevnode'] = hex(bookmarks[bookmark]) |
58 |
58 |
59 # Do not send pushback bundle2 part with bookmarks if remotenames extension |
59 # Do not send pushback bundle2 part with bookmarks if remotenames extension |
60 # is enabled. It will be handled manually in `_push()` |
60 # is enabled. It will be handled manually in `_push()` |
61 if not isremotebooksenabled(ui): |
61 if not isremotebooksenabled(ui): |
62 params[b'pushbackbookmarks'] = b'1' |
62 params[b'pushbackbookmarks'] = b'1' |