Show More
@@ -80,6 +80,11 b' class pushoperation(object):' | |||||
80 | # set of all heads common after changeset bundle push |
|
80 | # set of all heads common after changeset bundle push | |
81 | self.commonheads = None |
|
81 | self.commonheads = None | |
82 |
|
82 | |||
|
83 | @util.propertycache | |||
|
84 | def futureheads(self): | |||
|
85 | """future remote heads if the changeset push succeeds""" | |||
|
86 | return self.outgoing.missingheads | |||
|
87 | ||||
83 | def push(repo, remote, force=False, revs=None, newbranch=False): |
|
88 | def push(repo, remote, force=False, revs=None, newbranch=False): | |
84 | '''Push outgoing changesets (limited by revs) from a local |
|
89 | '''Push outgoing changesets (limited by revs) from a local | |
85 | repository to remote. Return an integer: |
|
90 | repository to remote. Return an integer: | |
@@ -310,8 +315,7 b' def _pushchangeset(pushop):' | |||||
310 | def _pushcomputecommonheads(pushop): |
|
315 | def _pushcomputecommonheads(pushop): | |
311 | unfi = pushop.repo.unfiltered() |
|
316 | unfi = pushop.repo.unfiltered() | |
312 | if pushop.ret: |
|
317 | if pushop.ret: | |
313 | # push succeed, synchronize target of the push |
|
318 | cheads = pushop.futureheads | |
314 | cheads = pushop.outgoing.missingheads |
|
|||
315 | elif pushop.revs is None: |
|
319 | elif pushop.revs is None: | |
316 | # All out push fails. synchronize all common |
|
320 | # All out push fails. synchronize all common | |
317 | cheads = pushop.outgoing.commonheads |
|
321 | cheads = pushop.outgoing.commonheads |
General Comments 0
You need to be logged in to leave comments.
Login now