Mercurial > hg
comparison mercurial/exchange.py @ 23139:e53f6b72a0e4
spelling: fixes from proofreading of spell checker issues
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 17 Apr 2014 22:47:38 +0200 |
parents | 0fc4686de1d7 |
children | 706547a14b8b |
comparison
equal
deleted
inserted
replaced
23136:6eab50a34fed | 23139:e53f6b72a0e4 |
---|---|
296 if not outgoing.missing: | 296 if not outgoing.missing: |
297 future = fallback | 297 future = fallback |
298 else: | 298 else: |
299 # adds changeset we are going to push as draft | 299 # adds changeset we are going to push as draft |
300 # | 300 # |
301 # should not be necessary for pushblishing server, but because of an | 301 # should not be necessary for publishing server, but because of an |
302 # issue fixed in xxxxx we have to do it anyway. | 302 # issue fixed in xxxxx we have to do it anyway. |
303 fdroots = list(unfi.set('roots(%ln + %ln::)', | 303 fdroots = list(unfi.set('roots(%ln + %ln::)', |
304 outgoing.missing, droots)) | 304 outgoing.missing, droots)) |
305 fdroots = [f.node() for f in fdroots] | 305 fdroots = [f.node() for f in fdroots] |
306 future = list(unfi.set(revset, fdroots, pushop.futureheads)) | 306 future = list(unfi.set(revset, fdroots, pushop.futureheads)) |
446 if not pushop.force: | 446 if not pushop.force: |
447 bundler.newpart('B2X:CHECK:HEADS', data=iter(pushop.remoteheads)) | 447 bundler.newpart('B2X:CHECK:HEADS', data=iter(pushop.remoteheads)) |
448 cg = changegroup.getlocalchangegroup(pushop.repo, 'push', pushop.outgoing) | 448 cg = changegroup.getlocalchangegroup(pushop.repo, 'push', pushop.outgoing) |
449 cgpart = bundler.newpart('B2X:CHANGEGROUP', data=cg.getchunks()) | 449 cgpart = bundler.newpart('B2X:CHANGEGROUP', data=cg.getchunks()) |
450 def handlereply(op): | 450 def handlereply(op): |
451 """extract addchangroup returns from server reply""" | 451 """extract addchangegroup returns from server reply""" |
452 cgreplies = op.records.getreplies(cgpart.id) | 452 cgreplies = op.records.getreplies(cgpart.id) |
453 assert len(cgreplies['changegroup']) == 1 | 453 assert len(cgreplies['changegroup']) == 1 |
454 pushop.cgresult = cgreplies['changegroup'][0]['return'] | 454 pushop.cgresult = cgreplies['changegroup'][0]['return'] |
455 return handlereply | 455 return handlereply |
456 | 456 |
700 msg = _('updating %s to public failed!\n') % node | 700 msg = _('updating %s to public failed!\n') % node |
701 if msg is not None: | 701 if msg is not None: |
702 pushop.ui.warn(msg) | 702 pushop.ui.warn(msg) |
703 | 703 |
704 else: | 704 else: |
705 # fallback to independant pushkey command | 705 # fallback to independent pushkey command |
706 for newremotehead in outdated: | 706 for newremotehead in outdated: |
707 r = pushop.remote.pushkey('phases', | 707 r = pushop.remote.pushkey('phases', |
708 newremotehead.hex(), | 708 newremotehead.hex(), |
709 str(phases.draft), | 709 str(phases.draft), |
710 str(phases.public)) | 710 str(phases.public)) |