Show More
@@ -127,14 +127,23 b' def pullremotenames(localrepo, remoterep' | |||
|
127 | 127 | remoterepo is the peer instance |
|
128 | 128 | """ |
|
129 | 129 | remotepath = activepath(localrepo, remoterepo) |
|
130 | bookmarks = remoterepo.listkeys('bookmarks') | |
|
130 | ||
|
131 | with remoterepo.commandexecutor() as e: | |
|
132 | bookmarks = e.callcommand('listkeys', { | |
|
133 | 'namespace': 'bookmarks', | |
|
134 | }).result() | |
|
135 | ||
|
131 | 136 | # on a push, we don't want to keep obsolete heads since |
|
132 | 137 | # they won't show up as heads on the next pull, so we |
|
133 | 138 | # remove them here otherwise we would require the user |
|
134 | 139 | # to issue a pull to refresh the storage |
|
135 | 140 | bmap = {} |
|
136 | 141 | repo = localrepo.unfiltered() |
|
137 | for branch, nodes in remoterepo.branchmap().iteritems(): | |
|
142 | ||
|
143 | with remoterepo.commandexecutor() as e: | |
|
144 | branchmap = e.callcommand('branchmap', {}).result() | |
|
145 | ||
|
146 | for branch, nodes in branchmap.iteritems(): | |
|
138 | 147 | bmap[branch] = [] |
|
139 | 148 | for node in nodes: |
|
140 | 149 | if node in repo and not repo[node].obsolete(): |
General Comments 0
You need to be logged in to leave comments.
Login now