This is an archive of the discontinued Mercurial Phabricator instance.

mercurial/context.py
1941	This breaks test-audit-path.t on macOS. In the test "attack /tmp/test", we call this codepath with f == '/tmp/test'. util.finddirs finds '/tmp', which on macOS is a symlink to /private/tmp, so L1940 is true and on L1941 we try to unlink /tmp. @mbthomas Is it intentional that we try to unlink symlinks to directories here? If not, we can fix this with: - if wvfs.isfileorlink(p): + if wvfs.isfileorlink(p) and not wvfs.isdir(p):

mbthomas mentioned this in D1156: tests: add test demonstrating regression in path audit.Oct 17 2017, 11:14 AM

mbthomas mentioned this in D1157: context: audit paths before clearing unknown files and dirs.

mbthomas added inline comments.Oct 17 2017, 11:16 AM

mercurial/context.py
1941	It's intentional to unlink symlinks, but it should not be doing anything outside the vfs. This is missing a vfs.audit() call. I've created D1157 to fix it.

mbthomas mentioned this in rHGd6009d1488e8: tests: add test demonstrating regression in path audit.Oct 17 2017, 5:21 PM

mbthomas mentioned this in rHG07bbb208a924: context: audit paths before clearing unknown files and dirs.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/context.py (9 lines)
M			tests/test-pathconflicts-basic.t (40 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2003		Sep 22 2017, 5:28 AM	★	★
Diff 2	2221		Oct 1 2017, 5:33 AM	★	★
Diff 3	2362		Oct 2 2017, 5:15 PM	★	★
Diff 4	2556	rHG33acbd671554e1638e08d93ed08b53604f2b2d4f	Oct 2 2017, 5:05 PM	★	★

Status	Author	Revision
Closed	mbthomas	D955 merge: improve comments in mergestate._makerecords
Closed	mbthomas	D861 commands: tidy up merge state decoding in resolve
Closed	mbthomas	D787 tests: add test for path conflicts during merge
Closed	mbthomas	D786 tests: add test for path conflicts during update
Closed	mbthomas	D785 context: also consider path conflicts when clearing unknown files
Closed	mbthomas	D784 merge: check for path conflicts when merging (issue5628)
Closed	mbthomas	D783 util: add safename function for generating safe names to rename to
Closed	mbthomas	D782 merge: improve error messages for path conflicts during update
Closed	mbthomas	D781 merge: check for path conflicts when updating (issue5628)
Closed	mbthomas	D780 merge: rename conflicts to fileconflicts in _checkunknownfiles
Closed	mbthomas	D779 merge: add _checkunknowndirs function for detecting path conflicts
Closed	mbthomas	D778 merge: backup conflicting directories when getting files
Closed	mbthomas	D777 merge: add merge action 'pr' to rename files during update
Closed	mbthomas	D776 merge: add merge action 'p' to record path conflicts during update
Closed	mbthomas	D775 commands: update the resolve command to handle path conflicts
Closed	mbthomas	D774 merge: add pathconflict merge state
Closed	mbthomas	D773 tests: add a test demonstrating basic path conflict failures
Closed	mbthomas	D680 scmutil: handle conflicting files and dirs in origbackuppath
Closed	mbthomas	D679 scmutil: don't append .orig to backups in origbackuppath

Diff 2556

mercurial/context.py

	self._repo.wwrite(self._path, data, flags,			self._repo.wwrite(self._path, data, flags,
	backgroundclose=backgroundclose)			backgroundclose=backgroundclose)

	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
	if wvfs.isdir(self._path) and not wvfs.islink(self._path):			f = self._path
	wvfs.removedirs(self._path)			if wvfs.isdir(f) and not wvfs.islink(f):
				wvfs.rmtree(f, forcibly=True)
				for p in reversed(list(util.finddirs(f))):
				if wvfs.isfileorlink(p):
				wvfs.unlink(p)
				swhitakerUnsubmitted Not Done This breaks test-audit-path.t on macOS. In the test "attack /tmp/test", we call this codepath with f == '/tmp/test'. util.finddirs finds '/tmp', which on macOS is a symlink to /private/tmp, so L1940 is true and on L1941 we try to unlink /tmp. @mbthomas Is it intentional that we try to unlink symlinks to directories here? If not, we can fix this with: - if wvfs.isfileorlink(p): + if wvfs.isfileorlink(p) and not wvfs.isdir(p): swhitaker: This breaks test-audit-path.t on macOS. In the test "attack /tmp/test", we call this codepath…
				mbthomasAuthorUnsubmitted Not Done It's intentional to unlink symlinks, but it should not be doing anything outside the vfs. This is missing a vfs.audit() call. I've created D1157 to fix it. mbthomas: It's intentional to unlink symlinks, but it should not be doing anything outside the vfs. This…
				break

	def setflags(self, l, x):			def setflags(self, l, x):
	self._repo.wvfs.setflags(self._path, l, x)			self._repo.wvfs.setflags(self._path, l, x)

	class overlayworkingctx(workingctx):			class overlayworkingctx(workingctx):
	"""Wraps another mutable context with a write-back cache that can be flushed			"""Wraps another mutable context with a write-back cache that can be flushed
	at a later time.			at a later time.

tests/test-pathconflicts-basic.t

	resolve manually then use 'hg resolve --mark a'			resolve manually then use 'hg resolve --mark a'
	moving a to a~853701544ac3			moving a to a~853701544ac3
	getting a/b			getting a/b
	1 files updated, 0 files merged, 0 files removed, 1 files unresolved			1 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
	[1]			[1]
	$ hg update --clean .			$ hg update --clean .
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ rm a~853701544ac3
				kiilerixUnsubmitted Done I don't know about these `~hash` files, but including the `+` in the name definitely seems wrong. kiilerix: I don't know about these `~hash` files, but including the `+` in the name definitely seems…
				mbthomasAuthorUnsubmitted Done I will strip the `+` characters. I didn't know these caused problems on Windows. mbthomas: I will strip the `+` characters. I didn't know these caused problems on Windows.
				mbthomasAuthorUnsubmitted Done Now stripping '+' symbols in D784. mbthomas: Now stripping '+' symbols in D784.

	Basic update - local directory conflicts with remote file			Basic update - local directory conflicts with remote file

	$ hg up -q 0			$ hg up -q 0
	$ mkdir a			$ mkdir a
	$ echo 3 > a/b			$ echo 3 > a/b
	$ hg up file			$ hg up file
	a: untracked directory conflicts with file			a: untracked directory conflicts with file
	abort: untracked files in working directory differ from files in requested revision			abort: untracked files in working directory differ from files in requested revision
	[255]			[255]
	$ hg up --clean file			$ hg up --clean file
	abort: *: '$TESTTMP/repo/a' (glob)			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	[255]			(activating bookmark file)

	Repo is in a very bad state now - recover manually			Repo state is ok

	$ rm -r a			$ hg sum
	$ hg up -q --clean 0			parent: 1:853701544ac3
				file
				branch: default
				bookmarks: *file
				commit: (clean)
				update: 2 new changesets (update)
				phases: 4 draft

	Basic update - untracked file conflicts with remote directory			Basic update - untracked file conflicts with remote directory

	$ hg up -q 0			$ hg up -q 0
	$ echo untracked > a			$ echo untracked > a
	$ hg up --config merge.checkunknown=warn dir			$ hg up --config merge.checkunknown=warn dir
	a: replacing untracked file			a: replacing untracked file
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(activating bookmark dir)			(activating bookmark dir)
				$ cat a.orig
				untracked
				$ rm -f a.orig

	Basic clean update - local directory conflicts with changed remote file			Basic clean update - local directory conflicts with changed remote file

	$ hg up -q file			$ hg up -q file
	$ rm a			$ rm a
	$ mkdir a			$ mkdir a
	$ echo 4 > a/b			$ echo 4 > a/b
	$ hg up file2			$ hg up file2
	abort: *: '$TESTTMP/repo/a' (glob)			abort: *: '$TESTTMP/repo/a' (glob)
	[255]			[255]
	$ hg up --clean file2			$ hg up --clean file2
	abort: *: '$TESTTMP/repo/a' (glob)			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	[255]			(activating bookmark file2)

	Repo is in a very bad state now - recover manually			Repo state is ok

	$ rm -r a			$ hg sum
	$ hg up -q --clean 0			parent: 2:f64e09fac717
				file2
				branch: default
				bookmarks: *file2
				commit: (clean)
				update: 1 new changesets, 2 branch heads (merge)
				phases: 4 draft

This is an archive of the discontinued Mercurial Phabricator instance.

context: also consider path conflicts when clearing unknown filesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 2556

mercurial/context.py

tests/test-pathconflicts-basic.t

context: also consider path conflicts when clearing unknown files
ClosedPublic

Revision Contents
Changeset List