equal
deleted
inserted
replaced
550 try: |
550 try: |
551 if opts.get('continue'): |
551 if opts.get('continue'): |
552 tp.resume(repo, source, opts) |
552 tp.resume(repo, source, opts) |
553 return |
553 return |
554 |
554 |
555 tf=tp.transplantfilter(repo, source, p1) |
555 tf = tp.transplantfilter(repo, source, p1) |
556 if opts.get('prune'): |
556 if opts.get('prune'): |
557 prune = [source.lookup(r) |
557 prune = [source.lookup(r) |
558 for r in cmdutil.revrange(source, opts.get('prune'))] |
558 for r in cmdutil.revrange(source, opts.get('prune'))] |
559 matchfn = lambda x: tf(x) and x not in prune |
559 matchfn = lambda x: tf(x) and x not in prune |
560 else: |
560 else: |