overlayworkingctx: remove flushall()
ClosedPublic

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	3065		Oct 23 2017, 3:44 PM	★	★
Diff 2	3556		Nov 16 2017, 1:01 AM	★	★
Diff 3	3560		Nov 16 2017, 1:04 AM	★	★
Diff 4	4039		Dec 1 2017, 3:09 AM	★	★
Diff 5	4172	rHG3ceebf497057051d4cee808d19f782efe637b0c0	Dec 1 2017, 3:07 AM	★	★

Status	Author	Revision
Closed	phillco	D1617 rebase: extract _assignworkingcopy
Closed	phillco	D1616 rebase: disable `inmemory` if the rebaseset contains the working copy
Closed	phillco	D1249 rebase: rerun a rebase on-disk if IMM merge conflicts arise
Closed	phillco	D1248 rebase: add concludememorynode(), and call it when rebasing in-memory
Closed	phillco	D1247 rebase: pass the wctx object (IMM or on-disk) to merge.update
Closed	phillco	D1246 rebase: do not update if IMM; instead, set the overlaywctx's parents
Closed	phillco	D1245 rebase: pass wctx to rebasenode()
Closed	phillco	D1244 overlayworkingctx: invalidate the manifest cache when changing parents
Closed	phillco	D1243 overlayworkingctx: add `_compact()`
Closed	phillco	D1242 overlayworkingctx: add ``tomemctx()`` and ``commit()``
Closed	phillco	D1241 overlayworkingctx: add _auditconflicts to write()
Closed	phillco	D1240 overlayworkingctx: inherit from committablectx instead of workingctx
Closed	phillco	D1239 overlayworkingctx: add a no-op ``clearunknown()``
Closed	phillco	D1238 overlayworkingctx: add _manifest, files(), added(), removed(), modified()
Closed	phillco	D1237 overlayworkingctx: add `_checkexist(path)`
Closed	phillco	D1236 overlayworkingctx: fix a bad reference to `self._path`
Closed	phillco	D1235 overlayworkingctx: track copy information in the context
Closed	phillco	D1234 rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
Closed	phillco	D1233 rebase: do not bail on uncomitted changes if rebasing in-memory
Closed	phillco	D1232 rebase: add the --inmemory option flag; assign a wctx object for the rebase
Closed	phillco	D1231 overlayworkingctx: move _wrappedctx out of the constructor
Closed	phillco	D1230 overlayworkingctx: make clean() public
Closed	phillco	D1216 overlayworkingctx: remove flushall()
Closed	phillco	D1215 merge: skip subrepo state, update hooks, and updating the dirstate in IMM
Closed	phillco	D1214 merge: don't check for unknown files in IMM
Closed	phillco	D1213 merge: remove calls to flushall()
Closed	phillco	D1212 filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM
Closed	phillco	D1211 context: switch ctx() use to changectx()
Abandoned	phillco	D1527 context: add an abstract base class for filectx

Diff 4172

mercurial/context.py

	# Only a case insensitive filesystem needs magic to translate user input			# Only a case insensitive filesystem needs magic to translate user input
	# to actual case in the filesystem.			# to actual case in the filesystem.
	icasefs = not util.fscasesensitive(r.root)			icasefs = not util.fscasesensitive(r.root)
	return matchmod.match(r.root, r.getcwd(), pats, include, exclude,			return matchmod.match(r.root, r.getcwd(), pats, include, exclude,
	default, auditor=r.auditor, ctx=self,			default, auditor=r.auditor, ctx=self,
	listsubrepos=listsubrepos, badfn=badfn,			listsubrepos=listsubrepos, badfn=badfn,
	icasefs=icasefs)			icasefs=icasefs)

	def flushall(self):
	pass # For overlayworkingfilectx compatibility.

	def _filtersuspectsymlink(self, files):			def _filtersuspectsymlink(self, files):
	if not files or self._repo.dirstate._checklink:			if not files or self._repo.dirstate._checklink:
	return files			return files

	# Symlink placeholders may get non-symlink-like contents			# Symlink placeholders may get non-symlink-like contents
	# via user error or dereferencing by NFS or Samba servers,			# via user error or dereferencing by NFS or Samba servers,
	# so we filter out any placeholders that don't look like a			# so we filter out any placeholders that don't look like a
	# symlink			# symlink
	if self.isdirty(path):			if self.isdirty(path):
	if self._cache[path]['exists']:			if self._cache[path]['exists']:
	return len(self._cache[path]['data'])			return len(self._cache[path]['data'])
	else:			else:
	raise error.ProgrammingError("No such file or directory: %s" %			raise error.ProgrammingError("No such file or directory: %s" %
	self._path)			self._path)
	return self._wrappedctx[path].size()			return self._wrappedctx[path].size()

	def flushall(self):
	for path in self._writeorder:
	entry = self._cache[path]
	if entry['exists']:
	self._wrappedctx[path].clearunknown()
	if entry['data'] is not None:
	if entry['flags'] is None:
	raise error.ProgrammingError('data set but not flags')
	self._wrappedctx[path].write(
	entry['data'],
	entry['flags'])
	else:
	self._wrappedctx[path].setflags(
	'l' in entry['flags'],
	'x' in entry['flags'])
	else:
	self._wrappedctx[path].remove(path)
	self._clean()

	def isdirty(self, path):			def isdirty(self, path):
	return path in self._cache			return path in self._cache

	def _clean(self):			def _clean(self):
	self._cache = {}			self._cache = {}
	self._writeorder = []

				martinvonzUnsubmitted Done _writeorder now seems unused martinvonz: _writeorder now seems unused
				phillcoAuthorUnsubmitted Done good catch! phillco: good catch!
	def _markdirty(self, path, exists, data=None, date=None, flags=''):			def _markdirty(self, path, exists, data=None, date=None, flags=''):
	if path not in self._cache:
	self._writeorder.append(path)

	self._cache[path] = {			self._cache[path] = {
	'exists': exists,			'exists': exists,
	'data': data,			'data': data,
	'date': date,			'date': date,
	'flags': flags,			'flags': flags,
	}			}

	def filectx(self, path, filelog=None):			def filectx(self, path, filelog=None):

This is an archive of the discontinued Mercurial Phabricator instance.

overlayworkingctx: remove flushall()ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 4172

mercurial/context.py

overlayworkingctx: remove flushall()
ClosedPublic

Revision Contents
Changeset List