This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D6341 contrib: have byteify-strings explode if run in Python 2
Closed	durin42	D6340 repair: reword comment about bookmarks logic
Closed	durin42	D6339 repair: reword comments that I noticed while working on source formatting
Closed	durin42	D6338 monotone: fix a bogus _() wrapper that was caught when formatting code

Diff 15005

	continue			continue
	if tofile.startswith(todir + '/'):			if tofile.startswith(todir + '/'):
	renamed[tofile] = fromdir + tofile[len(todir):]			renamed[tofile] = fromdir + tofile[len(todir):]
	# Avoid chained moves like:			# Avoid chained moves like:
	# d1(/a) => d3/d1(/a)			# d1(/a) => d3/d1(/a)
	# d2 => d3			# d2 => d3
	ignoremove[tofile] = 1			ignoremove[tofile] = 1
	for tofile, fromfile in renamed.items():			for tofile, fromfile in renamed.items():
	self.ui.debug (_("copying file in renamed directory "			self.ui.debug(
	"from '%s' to '%s'")			"copying file in renamed directory from '%s' to '%s'"
	% (fromfile, tofile), '\n')			% (fromfile, tofile), '\n')
	files[tofile] = rev			files[tofile] = rev
	copies[tofile] = fromfile			copies[tofile] = fromfile
	for fromfile in renamed.values():			for fromfile in renamed.values():
	files[fromfile] = rev			files[fromfile] = rev

	return (files.items(), copies, set())			return (files.items(), copies, set())

	def getfile(self, name, rev):			def getfile(self, name, rev):
	"(automate >= 12.0 - mtn >= 0.46 is needed)\n" % version)			"(automate >= 12.0 - mtn >= 0.46 is needed)\n" % version)

	def after(self):			def after(self):
	if self.automatestdio:			if self.automatestdio:
	self.mtnwritefp.close()			self.mtnwritefp.close()
	self.mtnwritefp = None			self.mtnwritefp = None
	self.mtnreadfp.close()			self.mtnreadfp.close()
	self.mtnreadfp = None			self.mtnreadfp = None