Mercurial > hg
comparison hgext/transplant.py @ 25695:ce3d4b858420
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Jul 2015 16:33:31 -0500 |
parents | 328739ea70c3 540cd0ddac49 |
children | 5ae4b128a291 |
comparison
equal
deleted
inserted
replaced
25694:5ede49f4383a | 25695:ce3d4b858420 |
---|---|
627 | 627 |
628 sourcerepo = opts.get('source') | 628 sourcerepo = opts.get('source') |
629 if sourcerepo: | 629 if sourcerepo: |
630 peer = hg.peer(repo, opts, ui.expandpath(sourcerepo)) | 630 peer = hg.peer(repo, opts, ui.expandpath(sourcerepo)) |
631 heads = map(peer.lookup, opts.get('branch', ())) | 631 heads = map(peer.lookup, opts.get('branch', ())) |
632 target = set(heads) | |
633 for r in revs: | |
634 try: | |
635 target.add(peer.lookup(r)) | |
636 except error.RepoError: | |
637 pass | |
632 source, csets, cleanupfn = bundlerepo.getremotechanges(ui, repo, peer, | 638 source, csets, cleanupfn = bundlerepo.getremotechanges(ui, repo, peer, |
633 onlyheads=heads, force=True) | 639 onlyheads=sorted(target), force=True) |
634 else: | 640 else: |
635 source = repo | 641 source = repo |
636 heads = map(source.lookup, opts.get('branch', ())) | 642 heads = map(source.lookup, opts.get('branch', ())) |
637 cleanupfn = None | 643 cleanupfn = None |
638 | 644 |