overlayworkingctx: add _manifest, files(), added(), removed(), modified()
ClosedPublic

mercurial/context.py
2003	pyflakes noticed this wasn't used. I'm cleaning it up in flight.
2015	Which makes me wonder if this method is dead code now. Could you check and send a follow-up if it is in fact dead? Thanks!

durin42 added inline comments.Dec 7 2017, 5:13 PM

mercurial/context.py
2003	Er, wait. As I look closer: should this be used down on lines 2025 and 2028? Will hold on my push until I hear back.

phillco marked an inline comment as done.Dec 7 2017, 7:06 PM

phillco added inline comments.Dec 7 2017, 7:11 PM

mercurial/context.py
2003	Oops, I think it should be and it got lost along the way. BUT LT ME CONFIRM.
2015	If it is dead I'll just remove it here.

phillco added inline comments.Dec 8 2017, 1:20 AM

mercurial/context.py
2003	*but let me confirm

phillco updated this revision to Diff 4230.Dec 8 2017, 1:37 AM

OK, kept it in and passing to man.setflag().

Closed by commit rHG2e1c32a9c97b: overlayworkingctx: add _manifest, files(), added(), removed(), modified() (authored by phillco). · Explain WhyDec 8 2017, 3:38 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/context.py (37 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	3111		Oct 26 2017, 12:48 AM	★	★
Diff 2	4184		Dec 7 2017, 4:22 PM	★	★
Diff 3	4203		Dec 7 2017, 4:44 PM	★	★
Diff 4	4230		Dec 8 2017, 1:37 AM	★	★
Diff 5	4267	rHG2e1c32a9c97bb82f29ba55583816840f306dd1bc	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 3111

mercurial/context.py

	# Must fallback here, too, because we only set flags.			# Must fallback here, too, because we only set flags.
	return self._wrappedctx[path].data()			return self._wrappedctx[path].data()
	else:			else:
	raise error.ProgrammingError("No such file or directory: %s" %			raise error.ProgrammingError("No such file or directory: %s" %
	path)			path)
	else:			else:
	return self._wrappedctx[path].data()			return self._wrappedctx[path].data()

				@propertycache
				def _manifest(self):
				parents = self.parents()
				man = parents[0].manifest().copy()

				flag = self._flagfunc
				durin42Unsubmitted Not Done pyflakes noticed this wasn't used. I'm cleaning it up in flight. durin42: pyflakes noticed this wasn't used. I'm cleaning it up in flight.
				durin42Unsubmitted Not Done Er, wait. As I look closer: should this be used down on lines 2025 and 2028? Will hold on my push until I hear back. durin42: Er, wait. As I look closer: should this be used down on lines 2025 and 2028? Will hold on my…
				phillcoAuthorUnsubmitted Not Done Oops, I think it should be and it got lost along the way. BUT LT ME CONFIRM. phillco: Oops, I think it should be and it got lost along the way. BUT LT ME CONFIRM.
				phillcoAuthorUnsubmitted Not Done but let me confirm phillco:* *but let me confirm
				for path in self.added():
				man[path] = addednodeid
				man.setflag(path,'')
				durin42Unsubmitted Done nit: space after comma (will fix in flight) durin42: nit: space after comma (will fix in flight)
				for path in self.modified():
				man[path] = modifiednodeid
				man.setflag(path, '')
				for path in self.removed():
				del man[path]
				return man

				@propertycache
				def _flagfunc(self):
				durin42Unsubmitted Not Done Which makes me wonder if this method is dead code now. Could you check and send a follow-up if it is in fact dead? Thanks! durin42: Which makes me wonder if this method is dead code now. Could you check and send a follow-up if…
				phillcoAuthorUnsubmitted Not Done If it is dead I'll just remove it here. phillco: If it is dead I'll just remove it here.
				def f(path):
				return self._cache[path]['flags']
				return f

				def files(self):
				return sorted(self.added() + self.modified() + self.removed())

				def modified(self):
				return [f for f in self._cache.keys() if self._cache[f]['exists'] and
				self._existsinparent(f)]

				def added(self):
				return [f for f in self._cache.keys() if self._cache[f]['exists'] and
				not self._existsinparent(f)]

				def removed(self):
				return [f for f in self._cache.keys() if
				not self._cache[f]['exists'] and self._existsinparent(f)]

	def isinmemory(self):			def isinmemory(self):
	return True			return True

	def filedate(self, path):			def filedate(self, path):
	if self.isdirty(path):			if self.isdirty(path):
	return self._cache[path]['date']			return self._cache[path]['date']
	else:			else:
	return self._wrappedctx[path].date()			return self._wrappedctx[path].date()

This is an archive of the discontinued Mercurial Phabricator instance.

overlayworkingctx: add _manifest, files(), added(), removed(), modified()ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 3111

mercurial/context.py

overlayworkingctx: add _manifest, files(), added(), removed(), modified()
ClosedPublic

Revision Contents
Changeset List