This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D8085 manifest: move matches method to be outside the interface
Closed	durin42	D8084 merge: use manifestdict.walk() instead of manifestdict.matches()
Closed	durin42	D8083 archival: use walk() instead of matches() on manifest
Closed	durin42	D8090 archival: use walk() instead of matches() on manifest
Closed	durin42	D8082 manifest: rewrite filesnotin to not make superfluous manifest copies
Closed	durin42	D8081 manifest: fix _very_ subtle bug with exact matchers passed to walk()
Closed	durin42	D8080 context: use manifest.walk() instead of manifest.match() to get file list
Closed	durin42	D8079 manifest: remove `.new()` from the interface

Diff 19923

	for i in pycompat.xrange(len(components)):			for i in pycompat.xrange(len(components)):
	component = b"/".join(components[0:i])			component = b"/".join(components[0:i])
	if component in self:			if component in self:
	fail(path, component)			fail(path, component)

	# Test the other direction -- that this path from p2 isn't a directory			# Test the other direction -- that this path from p2 isn't a directory
	# in p1 (test that p1 doesn't have any paths matching `path/*`).			# in p1 (test that p1 doesn't have any paths matching `path/*`).
	match = self.match([path], default=b'path')			match = self.match([path], default=b'path')
	matches = self.p1().manifest().matches(match)			mfiles = list(self.p1().manifest().walk(match))
	mfiles = matches.keys()
	if len(mfiles) > 0:			if len(mfiles) > 0:
	if len(mfiles) == 1 and mfiles[0] == path:			if len(mfiles) == 1 and mfiles[0] == path:
	return			return
	# omit the files which are deleted in current IMM wctx			# omit the files which are deleted in current IMM wctx
	mfiles = [m for m in mfiles if m in self]			mfiles = [m for m in mfiles if m in self]
	if not mfiles:			if not mfiles:
	return			return
	raise error.Abort(			raise error.Abort(