Patchwork [5,of,8] update: add quietempty flag to _showstats

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 14, 2015, 11:37 p.m.
Message ID <9a88fb698973eee02eed.1450136246@waste.org>
Download mbox | patch
Permalink /patch/12042/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 14, 2015, 11:37 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# 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

Patch

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