Mercurial > hg
comparison hgext/rebase.py @ 13235:6bf39d88c857
rename util.unlink to unlinkpath
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Sun, 02 Jan 2011 19:34:41 +0100 |
| parents | 6c800e7ef2f6 |
| children | e035356dbfdc 14c0988c314d |
comparison
equal
deleted
inserted
replaced
| 13234:0935ff767285 | 13235:6bf39d88c857 |
|---|---|
| 213 repair.strip(ui, repo, repo[min(rebased)].node(), "all") | 213 repair.strip(ui, repo, repo[min(rebased)].node(), "all") |
| 214 | 214 |
| 215 clearstatus(repo) | 215 clearstatus(repo) |
| 216 ui.note(_("rebase completed\n")) | 216 ui.note(_("rebase completed\n")) |
| 217 if os.path.exists(repo.sjoin('undo')): | 217 if os.path.exists(repo.sjoin('undo')): |
| 218 util.unlink(repo.sjoin('undo')) | 218 util.unlinkpath(repo.sjoin('undo')) |
| 219 if skipped: | 219 if skipped: |
| 220 ui.note(_("%d revisions have been skipped\n") % len(skipped)) | 220 ui.note(_("%d revisions have been skipped\n") % len(skipped)) |
| 221 finally: | 221 finally: |
| 222 release(lock, wlock) | 222 release(lock, wlock) |
| 223 | 223 |
| 391 repo.ui.debug('rebase status stored\n') | 391 repo.ui.debug('rebase status stored\n') |
| 392 | 392 |
| 393 def clearstatus(repo): | 393 def clearstatus(repo): |
| 394 'Remove the status files' | 394 'Remove the status files' |
| 395 if os.path.exists(repo.join("rebasestate")): | 395 if os.path.exists(repo.join("rebasestate")): |
| 396 util.unlink(repo.join("rebasestate")) | 396 util.unlinkpath(repo.join("rebasestate")) |
| 397 | 397 |
| 398 def restorestatus(repo): | 398 def restorestatus(repo): |
| 399 'Restore a previously stored status' | 399 'Restore a previously stored status' |
| 400 try: | 400 try: |
| 401 target = None | 401 target = None |