Show More
@@ -208,14 +208,11 b' def _headssummary(pushop):' | |||||
208 | ctx = repo[n] |
|
208 | ctx = repo[n] | |
209 | missingctx.add(ctx) |
|
209 | missingctx.add(ctx) | |
210 | branches.add(ctx.branch()) |
|
210 | branches.add(ctx.branch()) | |
211 | nbranches = branches.copy() |
|
|||
212 |
|
211 | |||
213 | with remote.commandexecutor() as e: |
|
212 | with remote.commandexecutor() as e: | |
214 | remotemap = e.callcommand('branchmap', {}).result() |
|
213 | remotemap = e.callcommand('branchmap', {}).result() | |
215 |
|
214 | |||
216 | remotebranches = set(remotemap) |
|
215 | remotebranches = set(remotemap) | |
217 | newbranches = branches - remotebranches |
|
|||
218 | branches.difference_update(newbranches) |
|
|||
219 |
|
216 | |||
220 | # A. register remote heads |
|
217 | # A. register remote heads | |
221 | for branch, heads in remotemap.iteritems(): |
|
218 | for branch, heads in remotemap.iteritems(): | |
@@ -229,12 +226,12 b' def _headssummary(pushop):' | |||||
229 | unsynced.append(h) |
|
226 | unsynced.append(h) | |
230 | headssum[branch] = (known, list(known), unsynced) |
|
227 | headssum[branch] = (known, list(known), unsynced) | |
231 | # B. add new branch data |
|
228 | # B. add new branch data | |
232 |
for branch in |
|
229 | for branch in branches: | |
233 | if branch not in headssum: |
|
230 | if branch not in headssum: | |
234 | headssum[branch] = (None, [], []) |
|
231 | headssum[branch] = (None, [], []) | |
235 |
|
232 | |||
236 | # C drop data about untouched branches: |
|
233 | # C drop data about untouched branches: | |
237 |
for branch in remotebranches - |
|
234 | for branch in remotebranches - branches: | |
238 | del headssum[branch] |
|
235 | del headssum[branch] | |
239 |
|
236 | |||
240 | # D. Update newmap with outgoing changes. |
|
237 | # D. Update newmap with outgoing changes. |
General Comments 0
You need to be logged in to leave comments.
Login now