Mercurial > hg-stable
comparison mercurial/exchange.py @ 21583:dc141bdb5cb0 stable
exchange: fix bad indentation
Those two lines where double indented for no good reasons.
This is backport of 71931b789424.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Wed, 07 May 2014 19:26:15 -0700 |
| parents | 7f6d99a79411 |
| children | ab5040cd5749 |
comparison
equal
deleted
inserted
replaced
| 21582:7f6d99a79411 | 21583:dc141bdb5cb0 |
|---|---|
| 572 capsblob = bundle2.encodecaps(pullop.repo.bundle2caps) | 572 capsblob = bundle2.encodecaps(pullop.repo.bundle2caps) |
| 573 kwargs['bundlecaps'].add('bundle2=' + urllib.quote(capsblob)) | 573 kwargs['bundlecaps'].add('bundle2=' + urllib.quote(capsblob)) |
| 574 # pulling changegroup | 574 # pulling changegroup |
| 575 pullop.todosteps.remove('changegroup') | 575 pullop.todosteps.remove('changegroup') |
| 576 if not pullop.fetch: | 576 if not pullop.fetch: |
| 577 pullop.repo.ui.status(_("no changes found\n")) | 577 pullop.repo.ui.status(_("no changes found\n")) |
| 578 pullop.cgresult = 0 | 578 pullop.cgresult = 0 |
| 579 else: | 579 else: |
| 580 kwargs['common'] = pullop.common | 580 kwargs['common'] = pullop.common |
| 581 kwargs['heads'] = pullop.heads or pullop.rheads | 581 kwargs['heads'] = pullop.heads or pullop.rheads |
| 582 if pullop.heads is None and list(pullop.common) == [nullid]: | 582 if pullop.heads is None and list(pullop.common) == [nullid]: |
| 583 pullop.repo.ui.status(_("requesting all changes\n")) | 583 pullop.repo.ui.status(_("requesting all changes\n")) |