equal
deleted
inserted
replaced
1944 """Removes conflicting items in the working directory so that |
1944 """Removes conflicting items in the working directory so that |
1945 ``write()`` can be called successfully. |
1945 ``write()`` can be called successfully. |
1946 """ |
1946 """ |
1947 wvfs = self._repo.wvfs |
1947 wvfs = self._repo.wvfs |
1948 f = self._path |
1948 f = self._path |
|
1949 wvfs.audit(f) |
1949 if wvfs.isdir(f) and not wvfs.islink(f): |
1950 if wvfs.isdir(f) and not wvfs.islink(f): |
1950 wvfs.rmtree(f, forcibly=True) |
1951 wvfs.rmtree(f, forcibly=True) |
1951 for p in reversed(list(util.finddirs(f))): |
1952 for p in reversed(list(util.finddirs(f))): |
1952 if wvfs.isfileorlink(p): |
1953 if wvfs.isfileorlink(p): |
1953 wvfs.unlink(p) |
1954 wvfs.unlink(p) |