Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 18143:242d2f4ec01c
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 | 7f5a0eba3768 |
children | c5bd753c5bc6 |
comparison
equal
deleted
inserted
replaced
18142:11d1a9143adb | 18143:242d2f4ec01c |
---|---|
4955 try: | 4955 try: |
4956 if not after: | 4956 if not after: |
4957 for f in list: | 4957 for f in list: |
4958 if f in added: | 4958 if f in added: |
4959 continue # we never unlink added files on remove | 4959 continue # we never unlink added files on remove |
4960 try: | 4960 util.unlinkpath(repo.wjoin(f), ignoremissing=True) |
4961 util.unlinkpath(repo.wjoin(f)) | |
4962 except OSError, inst: | |
4963 if inst.errno != errno.ENOENT: | |
4964 raise | |
4965 repo[None].forget(list) | 4961 repo[None].forget(list) |
4966 finally: | 4962 finally: |
4967 wlock.release() | 4963 wlock.release() |
4968 | 4964 |
4969 return ret | 4965 return ret |