equal
deleted
inserted
replaced
635 shutil.rmtree(cleandir, True) |
635 shutil.rmtree(cleandir, True) |
636 if srcpeer is not None: |
636 if srcpeer is not None: |
637 srcpeer.close() |
637 srcpeer.close() |
638 return srcpeer, destpeer |
638 return srcpeer, destpeer |
639 |
639 |
640 def _showstats(repo, stats): |
640 def _showstats(repo, stats, quietempty=False): |
|
641 if quietempty and not any(stats): |
|
642 return |
641 repo.ui.status(_("%d files updated, %d files merged, " |
643 repo.ui.status(_("%d files updated, %d files merged, " |
642 "%d files removed, %d files unresolved\n") % stats) |
644 "%d files removed, %d files unresolved\n") % stats) |
643 |
645 |
644 def updaterepo(repo, node, overwrite): |
646 def updaterepo(repo, node, overwrite): |
645 """Update the working directory to node. |
647 """Update the working directory to node. |