435 status = _("updating to branch %s\n") % bn |
435 status = _("updating to branch %s\n") % bn |
436 destrepo.ui.status(status) |
436 destrepo.ui.status(status) |
437 _update(destrepo, uprev) |
437 _update(destrepo, uprev) |
438 if update in destrepo._bookmarks: |
438 if update in destrepo._bookmarks: |
439 bookmarks.setcurrent(destrepo, update) |
439 bookmarks.setcurrent(destrepo, update) |
440 |
|
441 return srcpeer, destpeer |
|
442 finally: |
440 finally: |
443 release(srclock, destlock) |
441 release(srclock, destlock) |
444 if cleandir is not None: |
442 if cleandir is not None: |
445 shutil.rmtree(cleandir, True) |
443 shutil.rmtree(cleandir, True) |
446 if srcpeer is not None: |
444 if srcpeer is not None: |
447 srcpeer.close() |
445 srcpeer.close() |
|
446 return srcpeer, destpeer |
448 |
447 |
449 def _showstats(repo, stats): |
448 def _showstats(repo, stats): |
450 repo.ui.status(_("%d files updated, %d files merged, " |
449 repo.ui.status(_("%d files updated, %d files merged, " |
451 "%d files removed, %d files unresolved\n") % stats) |
450 "%d files removed, %d files unresolved\n") % stats) |
452 |
451 |