Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMatt Mackall <mpm@selenic.com>
Wed, 26 Feb 2014 17:57:23 -0600
changeset 20568 d7eb839535d1
parent 20567 de8eb208b7d0 (current diff)
parent 20565 f1c3ba167b0c (diff)
child 20569 0d4be103c734
merge with stable
--- a/hgext/purge.py	Thu Feb 27 00:23:21 2014 +0100
+++ b/hgext/purge.py	Wed Feb 26 17:57:23 2014 -0600
@@ -101,10 +101,12 @@
     status = repo.status(match=match, ignored=opts['all'], unknown=True)
 
     for f in sorted(status[4] + status[5]):
-        ui.note(_('removing file %s\n') % f)
+        if act:
+            ui.note(_('removing file %s\n') % f)
         remove(removefile, f)
 
     for f in sorted(directories, reverse=True):
         if match(f) and not os.listdir(repo.wjoin(f)):
-            ui.note(_('removing directory %s\n') % f)
+            if act:
+                ui.note(_('removing directory %s\n') % f)
             remove(os.rmdir, f)
--- a/tests/test-purge.t	Thu Feb 27 00:23:21 2014 +0100
+++ b/tests/test-purge.t	Wed Feb 26 17:57:23 2014 -0600
@@ -21,7 +21,7 @@
 delete an empty directory
 
   $ mkdir empty_dir
-  $ hg purge -p
+  $ hg purge -p -v
   empty_dir
   $ hg purge -v
   removing directory empty_dir
mercurial