purge: fix b777dd8f7836 (remove read-only files)

- use try/except to avoid unnecessary work
- edit only mode bits

hgext/purge.py

@@ -1,106 +1,110 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]
 #  hgext.purge =
 #
 # 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 util, commands, cmdutil
 from mercurial.i18n import _
 import os, stat
 
 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 managment
     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):
-        # read-only files cannot be unlinked under Windows
-        s = os.stat(path)
-        if (s.st_dev & stat.S_IWRITE) == 0:
-            os.chmod(path, s.st_mode | stat.S_IWRITE)
-        os.remove(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 = cmdutil.match(repo, dirs, opts)
     match.dir = directories.append
     status = repo.status(match=match, ignored=opts['all'], unknown=True)
 
     for f in util.sort(status[4] + status[5]):
         ui.note(_('Removing file %s\n') % f)
         remove(removefile, f)
 
     for f in util.sort(directories)[::-1]:
         if match(f) and not os.listdir(repo.wjoin(f)):
             ui.note(_('Removing directory %s\n') % f)
             remove(os.rmdir, f)
 
 cmdtable = {
     'purge|clean':
         (purge,
          [('a', 'abort-on-err', None, _('abort if an error occurs')),
           ('',  'all', None, _('purge ignored files too')),
           ('p', 'print', None, _('print the file names instead of deleting them')),
           ('0', 'print0', None, _('end filenames with NUL, for use with xargs'
                                   ' (implies -p)')),
          ] + commands.walkopts,
          _('hg purge [OPTION]... [DIR]...'))
 }

tests/test-purge

@@ -1,138 +1,138 b''
 #!/bin/sh
 
 cat <<EOF >> $HGRCPATH
 [extensions]
 hgext.purge=
 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
 touch untracked_file_readonly
 python <<EOF
 import os, stat
 f= 'untracked_file_readonly'
-os.chmod(f, os.stat(f).st_mode & ~stat.S_IWRITE)
+os.chmod(f, stat.S_IMODE(os.stat(f).st_mode) & ~stat.S_IWRITE)
 EOF
 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 % skip ignored files if --all not specified
 touch ignored
 hg purge -p
 hg purge -v
 ls
 hg purge -p --all
 hg purge -v --all
 ls
 
 echo % 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
 hg st
 
 hg purge -p
 hg purge -v 2> /dev/null
 hg st
 
 hg purge -v
 hg revert --all --quiet
 hg st -a
 
 echo '% tracked file in ignored directory (issue621)'
 echo directory >> .hgignore
 hg ci -m 'ignore directory'
 touch untracked_file
 hg purge -p
 hg purge -v
 
 echo % skip excluded files
 touch excluded_file
 hg purge -p -X excluded_file
 hg purge -v -X excluded_file
 ls
 rm excluded_file
 
 echo % 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
 ls excluded_dir
 rm -R excluded_dir
 
 echo % skip excluded empty dirs
 mkdir excluded_dir
 hg purge -p -X excluded_dir
 hg purge -v -X excluded_dir
 ls
 rmdir excluded_dir
 
 echo % 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