Show More
@@ -139,8 +139,7 b' def push(repo, remote, force=False, revs' | |||
|
139 | 139 | False) |
|
140 | 140 | and pushop.remote.capable('bundle2-exp')): |
|
141 | 141 | _pushbundle2(pushop) |
|
142 |
|
|
|
143 | _pushchangeset(pushop) | |
|
142 | _pushchangeset(pushop) | |
|
144 | 143 | _pushcomputecommonheads(pushop) |
|
145 | 144 | _pushsyncphase(pushop) |
|
146 | 145 | _pushobsolete(pushop) |
@@ -211,6 +210,9 b' def _pushb2ctx(pushop, bundler):' | |||
|
211 | 210 | |
|
212 | 211 | addchangegroup result is stored in the ``pushop.ret`` attribute. |
|
213 | 212 | """ |
|
213 | if 'changesets' in pushop.stepsdone: | |
|
214 | return | |
|
215 | pushop.stepsdone.add('changesets') | |
|
214 | 216 | # Send known heads to the server for race detection. |
|
215 | 217 | if not pushop.force: |
|
216 | 218 | bundler.newpart('B2X:CHECK:HEADS', data=iter(pushop.remoteheads)) |
@@ -263,6 +265,9 b' def _pushbundle2extrareply(pushop, op, e' | |||
|
263 | 265 | |
|
264 | 266 | def _pushchangeset(pushop): |
|
265 | 267 | """Make the actual push of changeset bundle to remote repo""" |
|
268 | if 'changesets' in pushop.stepsdone: | |
|
269 | return | |
|
270 | pushop.stepsdone.add('changesets') | |
|
266 | 271 | outgoing = pushop.outgoing |
|
267 | 272 | unbundle = pushop.remote.capable('unbundle') |
|
268 | 273 | # TODO: get bundlecaps from remote |
General Comments 0
You need to be logged in to leave comments.
Login now