This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	phillco	D1106 context: add workingfilectx.markcopied
Closed	phillco	D1105 merge: don't use workers in in-memory mode
Closed	phillco	D1060 filemerge: add a missing flushall()
Closed	phillco	D1059 filemerge: store backups in the overlayworkingctx if using imm
Closed	phillco	D1058 context: add overlayfilectx.cmp()
Closed	phillco	D1057 filemerge: use arbitraryfilectx for backups
Closed	phillco	D1056 context: add a fast-comparision path between arbitraryfilectx and workingfilectx

Diff 2863


	def __init__(self, repo, path, filelog=None, parent=None):			def __init__(self, repo, path, filelog=None, parent=None):
	super(overlayworkingfilectx, self).__init__(repo, path, filelog,			super(overlayworkingfilectx, self).__init__(repo, path, filelog,
	parent)			parent)
	self._repo = repo			self._repo = repo
	self._parent = parent			self._parent = parent
	self._path = path			self._path = path

				def cmp(self, fctx):
				return self.data() != fctx.data()

	def ctx(self):			def ctx(self):
	return self._parent			return self._parent

	def data(self):			def data(self):
	return self._parent.data(self._path)			return self._parent.data(self._path)

	def date(self):			def date(self):
	return self._parent.filedate(self._path)			return self._parent.filedate(self._path)