# HG changeset patch # User Christian Ebert # Date 2014-08-02 08:45:21 # Node ID 52d34d5415c9c7d8d544169104d2c06fa6f41f5c # Parent 97d5aca9bb66ab1b6c1f33cd76bdaa56fc9e4a31 purge: prefer util.unlink instead over own removefile diff --git a/hgext/purge.py b/hgext/purge.py --- a/hgext/purge.py +++ b/hgext/purge.py @@ -95,17 +95,6 @@ def purge(ui, repo, *dirs, **opts): 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 @@ -115,7 +104,7 @@ def purge(ui, repo, *dirs, **opts): for f in sorted(status[4] + status[5]): if act: ui.note(_('removing file %s\n') % f) - remove(removefile, f) + remove(util.unlink, f) if removedirs: for f in sorted(directories, reverse=True):