equal
deleted
inserted
replaced
838 tp.resume(repo, source, opts) |
838 tp.resume(repo, source, opts) |
839 return |
839 return |
840 |
840 |
841 tf = tp.transplantfilter(repo, source, p1) |
841 tf = tp.transplantfilter(repo, source, p1) |
842 if opts.get(b'prune'): |
842 if opts.get(b'prune'): |
843 prune = set( |
843 prune = { |
844 source[r].node() |
844 source[r].node() |
845 for r in scmutil.revrange(source, opts.get(b'prune')) |
845 for r in scmutil.revrange(source, opts.get(b'prune')) |
846 ) |
846 } |
847 matchfn = lambda x: tf(x) and x not in prune |
847 matchfn = lambda x: tf(x) and x not in prune |
848 else: |
848 else: |
849 matchfn = tf |
849 matchfn = tf |
850 merges = pycompat.maplist(source.lookup, opts.get(b'merge', ())) |
850 merges = pycompat.maplist(source.lookup, opts.get(b'merge', ())) |
851 revmap = {} |
851 revmap = {} |