equal
deleted
inserted
replaced
3103 pass |
3103 pass |
3104 if opts.get('exact') or opts.get('import_branch'): |
3104 if opts.get('exact') or opts.get('import_branch'): |
3105 repo.dirstate.setbranch(branch or 'default') |
3105 repo.dirstate.setbranch(branch or 'default') |
3106 |
3106 |
3107 files = {} |
3107 files = {} |
3108 patch.patch(ui, repo, tmpname, strip=strip, cwd=repo.root, |
3108 patch.patch(ui, repo, tmpname, strip=strip, files=files, |
3109 files=files, eolmode=None, similarity=sim / 100.0) |
3109 eolmode=None, similarity=sim / 100.0) |
3110 files = list(files) |
3110 files = list(files) |
3111 if opts.get('no_commit'): |
3111 if opts.get('no_commit'): |
3112 if message: |
3112 if message: |
3113 msgs.append(message) |
3113 msgs.append(message) |
3114 else: |
3114 else: |