Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 14260:00a881581400
patch: make patch()/internalpatch() always update the dirstate
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 08 May 2011 17:48:31 +0200 |
| parents | df9ccd39828c |
| children | 4030630fb59c |
comparison
equal
deleted
inserted
replaced
| 14259:df9ccd39828c | 14260:00a881581400 |
|---|---|
| 2621 pass | 2621 pass |
| 2622 if opts.get('exact') or opts.get('import_branch'): | 2622 if opts.get('exact') or opts.get('import_branch'): |
| 2623 repo.dirstate.setbranch(branch or 'default') | 2623 repo.dirstate.setbranch(branch or 'default') |
| 2624 | 2624 |
| 2625 files = {} | 2625 files = {} |
| 2626 try: | 2626 patch.patch(ui, repo, tmpname, strip=strip, cwd=repo.root, |
| 2627 patch.patch(tmpname, ui, strip=strip, cwd=repo.root, | 2627 files=files, eolmode=None, similarity=sim / 100.0) |
| 2628 files=files, eolmode=None) | 2628 files = list(files) |
| 2629 finally: | |
| 2630 files = patch.updatedir(ui, repo, files, | |
| 2631 similarity=sim / 100.0) | |
| 2632 if opts.get('no_commit'): | 2629 if opts.get('no_commit'): |
| 2633 if message: | 2630 if message: |
| 2634 msgs.append(message) | 2631 msgs.append(message) |
| 2635 else: | 2632 else: |
| 2636 if opts.get('exact'): | 2633 if opts.get('exact'): |