Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 2826:3aeab7bb5adc
Refactor update locking slightly
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 08 Aug 2006 09:19:20 -0500 |
| parents | 30f59f4a327e |
| children | 2ff57e3113a4 e78cad1f6b1f |
comparison
equal
deleted
inserted
replaced
| 2825:1ea086bc2086 | 2826:3aeab7bb5adc |
|---|---|
| 2604 else: | 2604 else: |
| 2605 handle(remove, False) | 2605 handle(remove, False) |
| 2606 | 2606 |
| 2607 if not opts.get('dry_run'): | 2607 if not opts.get('dry_run'): |
| 2608 repo.dirstate.forget(forget[0]) | 2608 repo.dirstate.forget(forget[0]) |
| 2609 r = hg.revert(repo, node, update.has_key) | 2609 r = hg.revert(repo, node, update.has_key, wlock) |
| 2610 repo.dirstate.update(add[0], 'a') | 2610 repo.dirstate.update(add[0], 'a') |
| 2611 repo.dirstate.update(undelete[0], 'n') | 2611 repo.dirstate.update(undelete[0], 'n') |
| 2612 repo.dirstate.update(remove[0], 'r') | 2612 repo.dirstate.update(remove[0], 'r') |
| 2613 return r | 2613 return r |
| 2614 | 2614 |