# HG changeset patch # User timeless # Date 2015-12-14 23:14:06 # Node ID 1cf3543cc7809502638de783c5e2be595252cfa0 # Parent 50b6a04f817fb3ab59efb7d63c6059d8095a63a1 update: add quietempty flag to _showstats if called with quietempty=True, suppress: 0 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -652,10 +652,10 @@ def updaterepo(repo, node, overwrite): return mergemod.update(repo, node, False, overwrite, labels=['working copy', 'destination']) -def update(repo, node): +def update(repo, node, quietempty=False): """update the working directory to node, merging linear changes""" stats = updaterepo(repo, node, False) - _showstats(repo, stats) + _showstats(repo, stats, quietempty) if stats[3]: repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) return stats[3] > 0