This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	13029		Jan 7 2019, 3:45 AM	★	★
Diff 2	13056		Jan 7 2019, 2:02 PM	★	★
Diff 3	13147		Jan 10 2019, 4:50 PM	★	★
Diff 4	13245	rHGa2ae27993e1638aea09afeff43e0efe712d35053	Dec 30 2018, 2:09 AM	★	★

Status	Author	Revision
Closed	martinvonz	D5512 narrow: use merge.ACTION_GET instead of duplicating 'g' constant
Closed	martinvonz	D5511 narrow: reuse narrowspec.updateworkingcopy() when narrowing
Closed	martinvonz	D5510 narrow: reuse narrowspec.updateworkingcopy() when widening
Closed	martinvonz	D5509 narrow: move copytonarrowspec() out of setnarrowpats()
Closed	martinvonz	D5508 narrow: extract repo property for store narrowmatcher
Closed	martinvonz	D5507 narrow: drop now-unnecessary reassignment of repo attributes
Closed	martinvonz	D5506 narrow: copy store narrowspec to working copy immediately
Closed	martinvonz	D5505 narrow: include working copy narrowspec in transaction journal
Closed	martinvonz	D5504 narrow: make dirstateguard back up and restore working copy narrowspec instead
Closed	martinvonz	D5556 narrow: include journal.narrowspec in transaction journal

Diff 13245

	return matchmod.intersectmatchers(match, nm)			return matchmod.intersectmatchers(match, nm)
	return matchmod.intersectmatchers(match, self._narrowmatch)			return matchmod.intersectmatchers(match, self._narrowmatch)
	return self._narrowmatch			return self._narrowmatch

	def setnarrowpats(self, newincludes, newexcludes):			def setnarrowpats(self, newincludes, newexcludes):
	narrowspec.save(self, newincludes, newexcludes)			narrowspec.save(self, newincludes, newexcludes)
	narrowspec.copytoworkingcopy(self)			narrowspec.copytoworkingcopy(self)
	self.invalidate(clearfilecache=True)			self.invalidate(clearfilecache=True)
	# So the next access won't be considered a conflict
	# TODO: It seems like there should be a way of doing this that
	# doesn't involve replacing these attributes.
	self.narrowpats = newincludes, newexcludes
	self._narrowmatch = narrowspec.match(self.root, include=newincludes,
	exclude=newexcludes)

	def __getitem__(self, changeid):			def __getitem__(self, changeid):
	if changeid is None:			if changeid is None:
	return context.workingctx(self)			return context.workingctx(self)
	if isinstance(changeid, context.basectx):			if isinstance(changeid, context.basectx):
	return changeid			return changeid
	if isinstance(changeid, slice):			if isinstance(changeid, slice):
	# wdirrev isn't contiguous so the slice shouldn't include it			# wdirrev isn't contiguous so the slice shouldn't include it