equal
deleted
inserted
replaced
402 return srcrepo, destrepo |
402 return srcrepo, destrepo |
403 finally: |
403 finally: |
404 release(srclock, destlock) |
404 release(srclock, destlock) |
405 if dircleanup is not None: |
405 if dircleanup is not None: |
406 dircleanup.cleanup() |
406 dircleanup.cleanup() |
|
407 if srcrepo is not None: |
|
408 srcrepo.close() |
407 |
409 |
408 def _showstats(repo, stats): |
410 def _showstats(repo, stats): |
409 repo.ui.status(_("%d files updated, %d files merged, " |
411 repo.ui.status(_("%d files updated, %d files merged, " |
410 "%d files removed, %d files unresolved\n") % stats) |
412 "%d files removed, %d files unresolved\n") % stats) |
411 |
413 |