D1157: context: audit paths before clearing unknown files and dirs
This revision was automatically updated to reflect the committed changes. Closed by commit rHG07bbb208a924: context: audit paths before clearing unknown files and dirs (authored by mbthomas, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1157?vs=2930=2946 REVISION DETAIL https://phab.mercurial-scm.org/D1157 AFFECTED FILES mercurial/context.py tests/test-audit-path.t CHANGE DETAILS diff --git a/tests/test-audit-path.t b/tests/test-audit-path.t --- a/tests/test-audit-path.t +++ b/tests/test-audit-path.t @@ -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 diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -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))): To: mbthomas, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D1157: context: audit paths before clearing unknown files and dirs
ryanmce accepted this revision. ryanmce added a comment. This revision is now accepted and ready to land. queued REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1157 To: mbthomas, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D1157: context: audit paths before clearing unknown files and dirs
mbthomas created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Fix regression introduced in https://phab.mercurial-scm.org/D785. In some circumstances, context.clearunknown can be called before the path is audited. Audit the path before deleting any conflicting files. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1157 AFFECTED FILES mercurial/context.py tests/test-audit-path.t CHANGE DETAILS diff --git a/tests/test-audit-path.t b/tests/test-audit-path.t --- a/tests/test-audit-path.t +++ b/tests/test-audit-path.t @@ -124,8 +124,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 diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -1940,6 +1940,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))): To: mbthomas, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
