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