purge.py: fix invocation of statwalk

contrib/purge/purge.py

@@ -1,113 +1,114 b''
 # Copyright (C) 2006 - Marco Barisione <[e-mail]>
 #
 # This is a small extension for Mercurial (http://www.selenic.com/mercurial)
 # 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/).
 #
 # To enable the "purge" extension put these lines in your ~/.hgrc:
 #  [extensions]
 #  purge = /path/to/purge.py
 #
 # 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, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 from mercurial import hg, util
 from mercurial.i18n import _
 import os
 
 def dopurge(ui, repo, dirs=None, act=True, abort_on_err=False, eol='\n'):
     def error(msg):
         if abort_on_err:
             raise util.Abort(msg)
         else:
             ui.warn(_('warning: %s\n') % msg)
 
     def remove(remove_func, name):
         if act:
             try:
                 remove_func(os.path.join(repo.root, name))
             except OSError, e:
                 error(_('%s cannot be removed') % name)
         else:
             ui.write('%s%s' % (name, eol))
 
     directories = []
     files = []
-    for src, f, st in repo.dirstate.statwalk(files=dirs, ignored=True,
-                                             directories=True):
+    roots, match, anypats = util.cmdmatcher(repo.root, repo.getcwd(), dirs)
+    for src, f, st in repo.dirstate.statwalk(files=roots, match=match,
+                                             ignored=True, directories=True):
         if   src == 'd':
             directories.append(f)
         elif src == 'f' and f not in repo.dirstate:
             files.append(f)
 
     directories.sort()
 
     for f in files:
         if f not in repo.dirstate:
             ui.note(_('Removing file %s\n') % f)
             remove(os.remove, f)
 
     for f in directories[::-1]:
         if not os.listdir(repo.wjoin(f)):
             ui.note(_('Removing directory %s\n') % f)
             remove(os.rmdir, f)
 
 
 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 the otherwise clean source tree.
 
     This means that purge will delete:
      - Unknown files: files marked with "?" by "hg status"
      - Ignored files: files usually ignored by Mercurial because they match
        a pattern in a ".hgignore" file
      - Empty directories: in fact Mercurial ignores directories unless they
        contain files under source control managment
     But it will leave untouched:
      - Unmodified tracked files
      - Modified tracked files
      - 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, 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']
     abort_on_err = bool(opts['abort_on_err'])
     eol = opts['print0'] and '\0' or '\n'
     if eol == '\0':
         # --print0 implies --print
         act = False
     dopurge(ui, repo, dirs, act, abort_on_err, eol)
 
 
 cmdtable = {
     'purge':
         (purge,
          [('a', 'abort-on-err', None, _('abort if an error occurs')),
           ('p', 'print', None, _('print the file names instead of deleting them')),
           ('0', 'print0', None, _('end filenames with NUL, for use with xargs'
                                   ' (implies -p)'))],
          _('hg purge [OPTION]... [DIR]...'))
 }

tests/test-purge

@@ -1,57 +1,76 b''
 #!/bin/sh
 
 cat <<EOF >> $HGRCPATH
 [extensions]
 purge=${TESTDIR}/../contrib/purge/purge.py
 EOF
 
 echo % init
 hg init t
 cd t
 
 echo % 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'
 
 echo % delete an empty directory
 mkdir empty_dir
 hg purge -p
 hg purge -v
 ls
 
 echo % delete an untracked directory
 mkdir untracked_dir
 touch untracked_dir/untracked_file1
 touch untracked_dir/untracked_file2
 hg purge -p
 hg purge -v
 ls
 
 echo % delete an untracked file
 touch untracked_file
 hg purge -p
 hg purge -v
 ls
 
 echo % delete an untracked file in a tracked directory
 touch directory/untracked_file
 hg purge -p
 hg purge -v
 ls
 
 echo % delete nested directories
 mkdir -p untracked_directory/nested_directory
 hg purge -p
 hg purge -v
 ls
 
+echo % delete nested directories from a subdir
+mkdir -p untracked_directory/nested_directory
+cd directory
+hg purge -p
+hg purge -v
+cd ..
+ls
+
+echo % delete only part of the tree
+mkdir -p untracked_directory/nested_directory
+touch directory/untracked_file
+cd directory
+hg purge -p ../untracked_directory
+hg purge -v ../untracked_directory
+cd ..
+ls
+ls directory/untracked_file
+rm directory/untracked_file
+
 echo % delete ignored files
 touch ignored
 hg purge -p
 hg purge -v
 ls

tests/test-purge.out

@@ -1,36 +1,49 b''
 % init
 % setup
 % delete an empty directory
 empty_dir
 Removing directory empty_dir
 directory
 r1
 % delete an untracked directory
 untracked_dir/untracked_file1
 untracked_dir/untracked_file2
 Removing file untracked_dir/untracked_file1
 Removing file untracked_dir/untracked_file2
 Removing directory untracked_dir
 directory
 r1
 % delete an untracked file
 untracked_file
 Removing file untracked_file
 directory
 r1
 % delete an untracked file in a tracked directory
 directory/untracked_file
 Removing file directory/untracked_file
 directory
 r1
 % delete nested directories
 untracked_directory/nested_directory
 Removing directory untracked_directory/nested_directory
 Removing directory untracked_directory
 directory
 r1
+% delete nested directories from a subdir
+untracked_directory/nested_directory
+Removing directory untracked_directory/nested_directory
+Removing directory untracked_directory
+directory
+r1
+% delete only part of the tree
+untracked_directory/nested_directory
+Removing directory untracked_directory/nested_directory
+Removing directory untracked_directory
+directory
+r1
+directory/untracked_file
 % delete ignored files
 ignored
 Removing file ignored
 directory
 r1