Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 4250:ca639faa38a2
Merge with crew-stable.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Mon, 19 Mar 2007 19:16:35 -0300 |
| parents | 0d51eb296fb9 89075f106414 |
| children | fe0fe0b4d73b |
comparison
equal
deleted
inserted
replaced
| 4244:7663780b55a7 | 4250:ca639faa38a2 |
|---|---|
| 763 """ | 763 """ |
| 764 | 764 |
| 765 if not rev2: | 765 if not rev2: |
| 766 rev2 = hex(nullid) | 766 rev2 = hex(nullid) |
| 767 | 767 |
| 768 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2)) | 768 wlock = repo.wlock() |
| 769 try: | |
| 770 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2)) | |
| 771 finally: | |
| 772 wlock.release() | |
| 769 | 773 |
| 770 def debugstate(ui, repo): | 774 def debugstate(ui, repo): |
| 771 """show the contents of the current dirstate""" | 775 """show the contents of the current dirstate""" |
| 772 repo.dirstate.read() | 776 repo.dirstate.read() |
| 773 dc = repo.dirstate.map | 777 dc = repo.dirstate.map |