Mercurial > hg
comparison mercurial/exchange.py @ 21764:cd3c79392056
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 18 Jun 2014 20:59:36 -0500 |
parents | 09f19e09f1b4 b2dc026a9bd2 |
children | 10fcfb615fb4 |
comparison
equal
deleted
inserted
replaced
21763:84cd5ee787ed | 21764:cd3c79392056 |
---|---|
279 else: | 279 else: |
280 remoteheads = pushop.remoteheads | 280 remoteheads = pushop.remoteheads |
281 # ssh: return remote's addchangegroup() | 281 # ssh: return remote's addchangegroup() |
282 # http: return remote's addchangegroup() or 0 for error | 282 # http: return remote's addchangegroup() or 0 for error |
283 pushop.ret = pushop.remote.unbundle(cg, remoteheads, | 283 pushop.ret = pushop.remote.unbundle(cg, remoteheads, |
284 'push') | 284 pushop.repo.url()) |
285 else: | 285 else: |
286 # we return an integer indicating remote head count | 286 # we return an integer indicating remote head count |
287 # change | 287 # change |
288 pushop.ret = pushop.remote.addchangegroup(cg, 'push', pushop.repo.url()) | 288 pushop.ret = pushop.remote.addchangegroup(cg, 'push', pushop.repo.url()) |
289 | 289 |