This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D2895 py3: use "%d" % int instead of str(int)
Closed	pulkit	D2894 py3: use pycompat.bytestr() in dirstate.py
Closed	pulkit	D2893 py3: make tests/test-log-linerange.t work on Python 3
Closed	pulkit	D2892 py3: use print as a function in tests/test-narrow-clone-non-narrow-server.t

Diff 7099

	def copies(self):			def copies(self):
	return self._map.copymap			return self._map.copymap

	def _addpath(self, f, state, mode, size, mtime):			def _addpath(self, f, state, mode, size, mtime):
	oldstate = self[f]			oldstate = self[f]
	if state == 'a' or oldstate == 'r':			if state == 'a' or oldstate == 'r':
	scmutil.checkfilename(f)			scmutil.checkfilename(f)
	if self._map.hastrackeddir(f):			if self._map.hastrackeddir(f):
	raise error.Abort(_('directory %r already in dirstate') % f)			raise error.Abort(_('directory %r already in dirstate') %
				pycompat.bytestr(f))
	# shadows			# shadows
	for d in util.finddirs(f):			for d in util.finddirs(f):
	if self._map.hastrackeddir(d):			if self._map.hastrackeddir(d):
	break			break
	entry = self._map.get(d)			entry = self._map.get(d)
	if entry is not None and entry[0] != 'r':			if entry is not None and entry[0] != 'r':
	raise error.Abort(			raise error.Abort(
	_('file %r in dirstate clashes with %r') % (d, f))			_('file %r in dirstate clashes with %r') %
				(pycompat.bytestr(d), pycompat.bytestr(f)))
	self._dirty = True			self._dirty = True
	self._updatedfiles.add(f)			self._updatedfiles.add(f)
	self._map.addfile(f, oldstate, state, mode, size, mtime)			self._map.addfile(f, oldstate, state, mode, size, mtime)

	def normal(self, f):			def normal(self, f):
	'''Mark a file normal and clean.'''			'''Mark a file normal and clean.'''
	s = os.lstat(self._join(f))			s = os.lstat(self._join(f))
	mtime = s[stat.ST_MTIME]			mtime = s[stat.ST_MTIME]