From patchwork Mon Dec 14 23:37:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [5,of,8] update: add quietempty flag to _showstats From: timeless@mozdev.org X-Patchwork-Id: 12042 Message-Id: <9a88fb698973eee02eed.1450136246@waste.org> To: mercurial-devel@selenic.com Date: Mon, 14 Dec 2015 17:37:26 -0600 # HG changeset patch # User timeless # Date 1450134846 0 # Mon Dec 14 23:14:06 2015 +0000 # Node ID 9a88fb698973eee02eed5e0cbd3a581f21a0a967 # Parent 411fed0e18c8cd18da2b87e58c9e4f6d5867118d 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 @@ -642,10 +642,10 @@ return mergemod.update(repo, node, False, overwrite, None, 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