# HG changeset patch # User Mark Thomas # Date 1508253073 25200 # Node ID 07bbb208a92469ecc053897537db674346d32535 # Parent d6009d1488e82f1be2d88b4df1a9b117ba0374fd context: audit paths before clearing unknown files and dirs Fix regression introduced in D785. In some circumstances, context.clearunknown can be called before the path is audited. Audit the path before deleting any conflicting files. Differential Revision: https://phab.mercurial-scm.org/D1157 diff -r d6009d1488e8 -r 07bbb208a924 mercurial/context.py --- a/mercurial/context.py Tue Oct 17 08:07:43 2017 -0700 +++ b/mercurial/context.py Tue Oct 17 08:11:13 2017 -0700 @@ -1946,6 +1946,7 @@ """ wvfs = self._repo.wvfs f = self._path + wvfs.audit(f) if wvfs.isdir(f) and not wvfs.islink(f): wvfs.rmtree(f, forcibly=True) for p in reversed(list(util.finddirs(f))): diff -r d6009d1488e8 -r 07bbb208a924 tests/test-audit-path.t --- a/tests/test-audit-path.t Tue Oct 17 08:07:43 2017 -0700 +++ b/tests/test-audit-path.t Tue Oct 17 08:11:13 2017 -0700 @@ -125,8 +125,7 @@ abort: path contains illegal component: ../test (glob) [255] $ cat ../test/file - cat: ../test/file: No such file or directory - [1] + data attack /tmp/test