Show More
@@ -182,7 +182,7 b' def findcommonoutgoing(repo, other, only' | |||
|
182 | 182 | |
|
183 | 183 | return og |
|
184 | 184 | |
|
185 |
def _headssummary( |
|
|
185 | def _headssummary(pushop): | |
|
186 | 186 | """compute a summary of branch and heads status before and after push |
|
187 | 187 | |
|
188 | 188 | return {'branch': ([remoteheads], [newheads], [unsyncedheads])} mapping |
@@ -193,6 +193,9 b' def _headssummary(repo, remote, outgoing' | |||
|
193 | 193 | - newheads: the new remote heads (known locally) with outgoing pushed |
|
194 | 194 | - unsyncedheads: the list of remote heads unknown locally. |
|
195 | 195 | """ |
|
196 | repo = pushop.repo.unfiltered() | |
|
197 | remote = pushop.remote | |
|
198 | outgoing = pushop.outgoing | |
|
196 | 199 | cl = repo.changelog |
|
197 | 200 | headssum = {} |
|
198 | 201 | # A. Create set of branches involved in the push. |
@@ -311,7 +314,7 b' def checkheads(pushop):' | |||
|
311 | 314 | return |
|
312 | 315 | |
|
313 | 316 | if remote.capable('branchmap'): |
|
314 |
headssum = _headssummary( |
|
|
317 | headssum = _headssummary(pushop) | |
|
315 | 318 | else: |
|
316 | 319 | headssum = _oldheadssummary(repo, remoteheads, outgoing, inc) |
|
317 | 320 | newbranches = [branch for branch, heads in headssum.iteritems() |
General Comments 0
You need to be logged in to leave comments.
Login now