overlayworkingctx: add `_compact()`
ClosedPublic

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	3116		Oct 26 2017, 12:48 AM	★	★
Diff 2	4189		Dec 7 2017, 4:22 PM	★	★
Diff 3	4208		Dec 7 2017, 4:44 PM	★	★
Diff 4	4216		Dec 7 2017, 4:52 PM	★	★
Diff 5	4235		Dec 8 2017, 1:37 AM	★	★
Diff 6	4249		Dec 8 2017, 2:31 AM	★	★
Diff 7	4272	rHGdc9da4f4f363e1c7835b9e3223afdf3382fec7c6	Dec 7 2017, 7:07 PM	★	★

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 3116

mercurial/context.py

	# Returning None, but including the path in `files`, is			# Returning None, but including the path in `files`, is
	# necessary for memctx to register a deletion.			# necessary for memctx to register a deletion.
	return None			return None
	return memctx(self._repo, parents, text, files, getfile, date=date,			return memctx(self._repo, parents, text, files, getfile, date=date,
	extra=extra, user=user, branch=branch, editor=editor)			extra=extra, user=user, branch=branch, editor=editor)

	def commit(self, text, parents=None, date=None, extra=None, editor=None,			def commit(self, text, parents=None, date=None, extra=None, editor=None,
	user=None, branch=None):			user=None, branch=None):
				# We need to discard any keys that are actually clean before the empty
				# commit check.
				self._compact()
	allowemptycommit = (len(self._cache) or			allowemptycommit = (len(self._cache) or
	self._repo.ui.configbool('ui', 'allowemptycommit'))			self._repo.ui.configbool('ui', 'allowemptycommit'))
	if not allowemptycommit:			if not allowemptycommit:
	return None			return None

	# By convention, ``extra['branch']`` clobbers ``branch`` (used when			# By convention, ``extra['branch']`` clobbers ``branch`` (used when
	# passing ``--keepbranches``).			# passing ``--keepbranches``).
	if 'branch' in extra:			if 'branch' in extra:
	branch = extra['branch']			branch = extra['branch']

	memctx = self.tomemctx(text, parents=parents, date=date, extra=extra,			memctx = self.tomemctx(text, parents=parents, date=date, extra=extra,
	user=user, branch=branch, editor=editor)			user=user, branch=branch, editor=editor)
	return self._repo.commitctx(memctx)			return self._repo.commitctx(memctx)

	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 = []			self._writeorder = []

				def _compact(self):
				"""Removes keys from the cache that are actually clean, by comparing
				them with the underlting context.
				durin42Unsubmitted Done typo: s/underlting/underlying/ durin42: typo: s/underlting/underlying/

				This can occur during the merge process, e.g. by passing --tool :local
				to resolve a conflict.
				"""
				keys = []
				for path in self._cache.keys():
				cache = self._cache[path]
				try:
				underlying = self._wrappedctx[path]
				if (underlying.data() == cache['data'] and
				underlying.flags() == cache['flags']):
				keys.append(path)
				except error.ManifestLookupError:
				# Path not in the underlying manifest (created).
				continue

				for path in keys:
				del self._cache[path]
				return keys

	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:			if path not in self._cache:
	self._writeorder.append(path)			self._writeorder.append(path)

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

This is an archive of the discontinued Mercurial Phabricator instance.

overlayworkingctx: add `_compact()`ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 3116

mercurial/context.py

overlayworkingctx: add `_compact()`
ClosedPublic

Revision Contents
Changeset List