This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1157

context: audit paths before clearing unknown files and dirs
ClosedPublic

Authored by mbthomas on Oct 17 2017, 11:15 AM.

Details

Reviewers
ryanmce
Group Reviewers
hg-reviewers
Commits
rHG07bbb208a924: context: audit paths before clearing unknown files and dirs
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mbthomas created this revision.Oct 17 2017, 11:15 AM
ryanmce accepted this revision.Oct 17 2017, 5:10 PM
ryanmce added a subscriber: ryanmce.

queued

This revision is now accepted and ready to land.Oct 17 2017, 5:10 PM
Closed by commit rHG07bbb208a924: context: audit paths before clearing unknown files and dirs (authored by mbthomas). · Explain WhyOct 17 2017, 5:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (1 line)
Mtests/test-audit-path.t (3 lines)

Diff 2946

mercurial/context.py

self._repo.dirstate.copy(src, self._path) self._repo.dirstate.copy(src, self._path)
def clearunknown(self): def clearunknown(self):
"""Removes conflicting items in the working directory so that """Removes conflicting items in the working directory so that
``write()`` can be called successfully. ``write()`` can be called successfully.
""" """
wvfs = self._repo.wvfs wvfs = self._repo.wvfs
f = self._path f = self._path
wvfs.audit(f)
if wvfs.isdir(f) and not wvfs.islink(f): if wvfs.isdir(f) and not wvfs.islink(f):
wvfs.rmtree(f, forcibly=True) wvfs.rmtree(f, forcibly=True)
for p in reversed(list(util.finddirs(f))): for p in reversed(list(util.finddirs(f))):
if wvfs.isfileorlink(p): if wvfs.isfileorlink(p):
wvfs.unlink(p) wvfs.unlink(p)
break break
def setflags(self, l, x): def setflags(self, l, x):

tests/test-audit-path.t

$ hg manifest -r3 $ hg manifest -r3
../test ../test
$ mkdir ../test $ mkdir ../test
$ echo data > ../test/file $ echo data > ../test/file
$ hg update -Cr3 $ hg update -Cr3
abort: path contains illegal component: ../test (glob) abort: path contains illegal component: ../test (glob)
[255] [255]
$ cat ../test/file $ cat ../test/file
cat: ../test/file: No such file or directory data
[1]
attack /tmp/test attack /tmp/test
$ hg manifest -r4 $ hg manifest -r4
/tmp/test /tmp/test
$ hg update -Cr4 $ hg update -Cr4
abort: path contains illegal component: /tmp/test (glob) abort: path contains illegal component: /tmp/test (glob)
[255] [255]