This is an archive of the discontinued Mercurial Phabricator instance.

	IMM, we'll never check that a path is actually writable -- e.g., because			IMM, we'll never check that a path is actually writable -- e.g., because
	it adds `a/foo`, but `a` is actually a file in the other commit.			it adds `a/foo`, but `a` is actually a file in the other commit.
	"""			"""
	def fail(path, component):			def fail(path, component):
	# p1() is the base and we're receiving "writes" for p2()'s			# p1() is the base and we're receiving "writes" for p2()'s
	# files.			# files.
	if 'l' in self.p1()[component].flags():			if 'l' in self.p1()[component].flags():
	raise error.Abort("error: %s conflicts with symlink %s "			raise error.Abort("error: %s conflicts with symlink %s "
	"in %s." % (path, component,			"in %d." % (path, component,
	self.p1().rev()))			self.p1().rev()))
	else:			else:
	raise error.Abort("error: '%s' conflicts with file '%s' in "			raise error.Abort("error: '%s' conflicts with file '%s' in "
	"%s." % (path, component,			"%d." % (path, component,
	self.p1().rev()))			self.p1().rev()))

	# Test that each new directory to be created to write this path from p2			# Test that each new directory to be created to write this path from p2
	# is not a file in p1.			# is not a file in p1.
	components = path.split('/')			components = path.split('/')
	for i in pycompat.xrange(len(components)):			for i in pycompat.xrange(len(components)):
	component = "/".join(components[0:i])			component = "/".join(components[0:i])
	if component in self:			if component in self:

py3: use '%d' for integers instead of '%s'ClosedPublic