Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: audit paths before clearing unknown files and dirs
authorMark Thomas <mbthomas@fb.com>
Tue, 17 Oct 2017 08:11:13 -0700
changeset 34833 07bbb208a924
parent 34832 d6009d1488e8
child 34834 2e8477059d4f
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
mercurial/context.py file | annotate | diff | comparison | revisions
tests/test-audit-path.t file | annotate | diff | comparison | revisions 
--- 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))):
--- 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
Mercurial