changeset 27404:1cf3543cc780

update: add quietempty flag to _showstats if called with quietempty=True, suppress: 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
author timeless <timeless@mozdev.org>
date Mon, 14 Dec 2015 23:14:06 +0000
parents 50b6a04f817f
children 5837ca674da9
files mercurial/hg.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Mon Dec 14 22:08:14 2015 +0000
+++ b/mercurial/hg.py	Mon Dec 14 23:14:06 2015 +0000
@@ -652,10 +652,10 @@
     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