merge with stable

hgext/purge.py

@@ -1,110 +1,112 b''
 # Copyright (C) 2006 - Marco Barisione <[e-mail]>
 #
 # This is a small extension for Mercurial (http://mercurial.selenic.com/)
 # that removes files not known to mercurial
 #
 # This program was inspired by the "cvspurge" script contained in CVS
 # utilities (http://www.red-bean.com/cvsutils/).
 #
 # For help on the usage of "hg purge" use:
 #  hg help purge
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 '''command to delete untracked files from the working directory'''
 
 from mercurial import util, commands, cmdutil, scmutil
 from mercurial.i18n import _
 import os, stat
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)
 testedwith = 'internal'
 
 @command('purge|clean',
     [('a', 'abort-on-err', None, _('abort if an error occurs')),
     ('',  'all', None, _('purge ignored files too')),
     ('p', 'print', None, _('print filenames instead of deleting them')),
     ('0', 'print0', None, _('end filenames with NUL, for use with xargs'
                             ' (implies -p/--print)')),
     ] + commands.walkopts,
     _('hg purge [OPTION]... [DIR]...'))
 def purge(ui, repo, *dirs, **opts):
     '''removes files not tracked by Mercurial
 
     Delete files not known to Mercurial. This is useful to test local
     and uncommitted changes in an otherwise-clean source tree.
 
     This means that purge will delete:
 
     - Unknown files: files marked with "?" by :hg:`status`
     - Empty directories: in fact Mercurial ignores directories unless
       they contain files under source control management
 
     But it will leave untouched:
 
     - Modified and unmodified tracked files
     - Ignored files (unless --all is specified)
     - New files added to the repository (with :hg:`add`)
 
     If directories are given on the command line, only files in these
     directories are considered.
 
     Be careful with purge, as you could irreversibly delete some files
     you forgot to add to the repository. If you only want to print the
     list of files that this program would delete, use the --print
     option.
     '''
     act = not opts['print']
     eol = '\n'
     if opts['print0']:
         eol = '\0'
         act = False # --print0 implies --print
 
     def remove(remove_func, name):
         if act:
             try:
                 remove_func(repo.wjoin(name))
             except OSError:
                 m = _('%s cannot be removed') % name
                 if opts['abort_on_err']:
                     raise util.Abort(m)
                 ui.warn(_('warning: %s\n') % m)
         else:
             ui.write('%s%s' % (name, eol))
 
     def removefile(path):
         try:
             os.remove(path)
         except OSError:
             # read-only files cannot be unlinked under Windows
             s = os.stat(path)
             if (s.st_mode & stat.S_IWRITE) != 0:
                 raise
             os.chmod(path, stat.S_IMODE(s.st_mode) | stat.S_IWRITE)
             os.remove(path)
 
     directories = []
     match = scmutil.match(repo[None], dirs, opts)
     match.explicitdir = match.traversedir = directories.append
     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)

tests/test-purge.t

@@ -1,218 +1,218 b''
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > purge =
   > EOF
 
 init
 
   $ hg init t
   $ cd t
 
 setup
 
   $ echo r1 > r1
   $ hg ci -qAmr1 -d'0 0'
   $ mkdir directory
   $ echo r2 > directory/r2
   $ hg ci -qAmr2 -d'1 0'
   $ echo 'ignored' > .hgignore
   $ hg ci -qAmr3 -d'2 0'
 
 delete an empty directory
 
   $ mkdir empty_dir
-  $ hg purge -p
+  $ hg purge -p -v
   empty_dir
   $ hg purge -v
   removing directory empty_dir
   $ ls
   directory
   r1
 
 delete an untracked directory
 
   $ mkdir untracked_dir
   $ touch untracked_dir/untracked_file1
   $ touch untracked_dir/untracked_file2
   $ hg purge -p
   untracked_dir/untracked_file1
   untracked_dir/untracked_file2
   $ hg purge -v
   removing file untracked_dir/untracked_file1
   removing file untracked_dir/untracked_file2
   removing directory untracked_dir
   $ ls
   directory
   r1
 
 delete an untracked file
 
   $ touch untracked_file
   $ touch untracked_file_readonly
   $ python <<EOF
   > import os, stat
   > f= 'untracked_file_readonly'
   > os.chmod(f, stat.S_IMODE(os.stat(f).st_mode) & ~stat.S_IWRITE)
   > EOF
   $ hg purge -p
   untracked_file
   untracked_file_readonly
   $ hg purge -v
   removing file untracked_file
   removing file untracked_file_readonly
   $ ls
   directory
   r1
 
 delete an untracked file in a tracked directory
 
   $ touch directory/untracked_file
   $ hg purge -p
   directory/untracked_file
   $ hg purge -v
   removing file directory/untracked_file
   $ ls
   directory
   r1
 
 delete nested directories
 
   $ mkdir -p untracked_directory/nested_directory
   $ hg purge -p
   untracked_directory/nested_directory
   $ hg purge -v
   removing directory untracked_directory/nested_directory
   removing directory untracked_directory
   $ ls
   directory
   r1
 
 delete nested directories from a subdir
 
   $ mkdir -p untracked_directory/nested_directory
   $ cd directory
   $ hg purge -p
   untracked_directory/nested_directory
   $ hg purge -v
   removing directory untracked_directory/nested_directory
   removing directory untracked_directory
   $ cd ..
   $ ls
   directory
   r1
 
 delete only part of the tree
 
   $ mkdir -p untracked_directory/nested_directory
   $ touch directory/untracked_file
   $ cd directory
   $ hg purge -p ../untracked_directory
   untracked_directory/nested_directory
   $ hg purge -v ../untracked_directory
   removing directory untracked_directory/nested_directory
   removing directory untracked_directory
   $ cd ..
   $ ls
   directory
   r1
   $ ls directory/untracked_file
   directory/untracked_file
   $ rm directory/untracked_file
 
 skip ignored files if --all not specified
 
   $ touch ignored
   $ hg purge -p
   $ hg purge -v
   $ ls
   directory
   ignored
   r1
   $ hg purge -p --all
   ignored
   $ hg purge -v --all
   removing file ignored
   $ ls
   directory
   r1
 
 abort with missing files until we support name mangling filesystems
 
   $ touch untracked_file
   $ rm r1
 
 hide error messages to avoid changing the output when the text changes
 
   $ hg purge -p 2> /dev/null
   untracked_file
   $ hg st
   ! r1
   ? untracked_file
 
   $ hg purge -p
   untracked_file
   $ hg purge -v 2> /dev/null
   removing file untracked_file
   $ hg st
   ! r1
 
   $ hg purge -v
   $ hg revert --all --quiet
   $ hg st -a
 
 tracked file in ignored directory (issue621)
 
   $ echo directory >> .hgignore
   $ hg ci -m 'ignore directory'
   $ touch untracked_file
   $ hg purge -p
   untracked_file
   $ hg purge -v
   removing file untracked_file
 
 skip excluded files
 
   $ touch excluded_file
   $ hg purge -p -X excluded_file
   $ hg purge -v -X excluded_file
   $ ls
   directory
   excluded_file
   r1
   $ rm excluded_file
 
 skip files in excluded dirs
 
   $ mkdir excluded_dir
   $ touch excluded_dir/file
   $ hg purge -p -X excluded_dir
   $ hg purge -v -X excluded_dir
   $ ls
   directory
   excluded_dir
   r1
   $ ls excluded_dir
   file
   $ rm -R excluded_dir
 
 skip excluded empty dirs
 
   $ mkdir excluded_dir
   $ hg purge -p -X excluded_dir
   $ hg purge -v -X excluded_dir
   $ ls
   directory
   excluded_dir
   r1
   $ rmdir excluded_dir
 
 skip patterns
 
   $ mkdir .svn
   $ touch .svn/foo
   $ mkdir directory/.svn
   $ touch directory/.svn/foo
   $ hg purge -p -X .svn -X '*/.svn'
   $ hg purge -p -X re:.*.svn
 
   $ cd ..