| hg-reviewers |
map() returns a map-object on Python3 instead of a list.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| raise error.Abort(_('outstanding uncommitted merges')) | raise error.Abort(_('outstanding uncommitted merges')) | ||||
| m, a, r, d = repo.status()[:4] | m, a, r, d = repo.status()[:4] | ||||
| if m or a or r or d: | if m or a or r or d: | ||||
| raise error.Abort(_('outstanding local changes')) | raise error.Abort(_('outstanding local changes')) | ||||
| sourcerepo = opts.get('source') | sourcerepo = opts.get('source') | ||||
| if sourcerepo: | if sourcerepo: | ||||
| peer = hg.peer(repo, opts, ui.expandpath(sourcerepo)) | peer = hg.peer(repo, opts, ui.expandpath(sourcerepo)) | ||||
| heads = map(peer.lookup, opts.get('branch', ())) | heads = pycompat.maplist(peer.lookup, opts.get('branch', ())) | ||||
| target = set(heads) | target = set(heads) | ||||
| for r in revs: | for r in revs: | ||||
| try: | try: | ||||
| target.add(peer.lookup(r)) | target.add(peer.lookup(r)) | ||||
| except error.RepoError: | except error.RepoError: | ||||
| pass | pass | ||||
| source, csets, cleanupfn = bundlerepo.getremotechanges(ui, repo, peer, | source, csets, cleanupfn = bundlerepo.getremotechanges(ui, repo, peer, | ||||
| onlyheads=sorted(target), force=True) | onlyheads=sorted(target), force=True) | ||||
| else: | else: | ||||
| source = repo | source = repo | ||||
| heads = map(source.lookup, opts.get('branch', ())) | heads = pycompat.maplist(source.lookup, opts.get('branch', ())) | ||||
| cleanupfn = None | cleanupfn = None | ||||
| try: | try: | ||||
| if opts.get('continue'): | if opts.get('continue'): | ||||
| tp.resume(repo, source, opts) | tp.resume(repo, source, opts) | ||||
| return | return | ||||
| tf = tp.transplantfilter(repo, source, p1) | tf = tp.transplantfilter(repo, source, p1) | ||||
| if opts.get('prune'): | if opts.get('prune'): | ||||
| prune = set(source[r].node() | prune = set(source[r].node() | ||||
| for r in scmutil.revrange(source, opts.get('prune'))) | for r in scmutil.revrange(source, opts.get('prune'))) | ||||
| matchfn = lambda x: tf(x) and x not in prune | matchfn = lambda x: tf(x) and x not in prune | ||||
| else: | else: | ||||
| matchfn = tf | matchfn = tf | ||||
| merges = map(source.lookup, opts.get('merge', ())) | merges = pycompat.maplist(source.lookup, opts.get('merge', ())) | ||||
| revmap = {} | revmap = {} | ||||
| if revs: | if revs: | ||||
| for r in scmutil.revrange(source, revs): | for r in scmutil.revrange(source, revs): | ||||
| revmap[int(r)] = source[r].node() | revmap[int(r)] = source[r].node() | ||||
| elif opts.get('all') or not merges: | elif opts.get('all') or not merges: | ||||
| if source != repo: | if source != repo: | ||||
| alltransplants = incwalk(source, csets, match=matchfn) | alltransplants = incwalk(source, csets, match=matchfn) | ||||
| else: | else: | ||||