Mercurial > public > mercurial-scm > hg-stable

diff mercurial/windows.py @ 18143:242d2f4ec01c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: fold ENOENT check into unlinkpath, controlled by new ignoremissing flag Refactor a common pattern.
author Mads Kiilerich <madski@unity3d.com>
date Fri, 28 Dec 2012 11:55:57 +0100
parents f0cfa27c712a
children cafa447a7d3b
line wrap: on
line diff
--- a/mercurial/windows.py	Fri Dec 28 11:55:45 2012 +0100
+++ b/mercurial/windows.py	Fri Dec 28 11:55:57 2012 +0100
@@ -275,9 +275,13 @@
             break
         head, tail = os.path.split(head)
 
-def unlinkpath(f):
+def unlinkpath(f, ignoremissing=False):
     """unlink and remove the directory if it is empty"""
-    unlink(f)
+    try:
+        unlink(f)
+    except OSError, e:
+        if not (ignoremissing and e.errno == errno.ENOENT):
+            raise
     # try removing directories that might now be empty
     try:
         _removedirs(os.path.dirname(f))