Show More
@@ -46,6 +46,8 b' class pushoperation(object):' | |||||
46 | self.outgoing = None |
|
46 | self.outgoing = None | |
47 | # all remote heads before the push |
|
47 | # all remote heads before the push | |
48 | self.remoteheads = None |
|
48 | self.remoteheads = None | |
|
49 | # testable as a boolean indicating if any nodes are missing locally. | |||
|
50 | self.incoming = None | |||
49 |
|
51 | |||
50 | def push(repo, remote, force=False, revs=None, newbranch=False): |
|
52 | def push(repo, remote, force=False, revs=None, newbranch=False): | |
51 | '''Push outgoing changesets (limited by revs) from a local |
|
53 | '''Push outgoing changesets (limited by revs) from a local | |
@@ -107,6 +109,7 b' def push(repo, remote, force=False, revs' | |||||
107 | commoninc=commoninc, force=pushop.force) |
|
109 | commoninc=commoninc, force=pushop.force) | |
108 | pushop.outgoing = outgoing |
|
110 | pushop.outgoing = outgoing | |
109 | pushop.remoteheads = remoteheads |
|
111 | pushop.remoteheads = remoteheads | |
|
112 | pushop.incoming = inc | |||
110 |
|
113 | |||
111 |
|
114 | |||
112 | if not outgoing.missing: |
|
115 | if not outgoing.missing: | |
@@ -140,7 +143,7 b' def push(repo, remote, force=False, revs' | |||||
140 | newbm = pushop.ui.configlist('bookmarks', 'pushing') |
|
143 | newbm = pushop.ui.configlist('bookmarks', 'pushing') | |
141 | discovery.checkheads(unfi, pushop.remote, outgoing, |
|
144 | discovery.checkheads(unfi, pushop.remote, outgoing, | |
142 | remoteheads, pushop.newbranch, |
|
145 | remoteheads, pushop.newbranch, | |
143 | bool(inc), newbm) |
|
146 | bool(pushop.incoming), newbm) | |
144 | _pushchangeset(pushop) |
|
147 | _pushchangeset(pushop) | |
145 | _pushsyncphase(pushop) |
|
148 | _pushsyncphase(pushop) | |
146 | _pushobsolete(pushop) |
|
149 | _pushobsolete(pushop) |
General Comments 0
You need to be logged in to leave comments.
Login now