This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30127		Aug 27 2021, 1:11 PM	★	★
Diff 2	30148		Aug 30 2021, 9:00 AM	★	★
Diff 3	30162	rHGf94cc63df859c27851c2711aeaaad39b9e00daf0	Aug 27 2021, 11:14 AM	★	★

Status	Author	Revision
Closed	marmoute	D11375 dirstate-item: implement `v1_mtime` with higher level block
Closed	marmoute	D11374 dirstate-item: implement `v1_size` with higher level block
Closed	marmoute	D11373 dirstate-item: implement v1_state with higher level block
Closed	marmoute	D11372 dirstate-item: add more logic to `from_p2`
Closed	marmoute	D11371 dirstate-item: implement `merged_removed` in a simpler way
Closed	marmoute	D11370 dirstate-item: implement `removed` in a simpler way
Closed	marmoute	D11369 dirstate-item: implement `from_p2_removed` in a simpler way
Closed	marmoute	D11368 dirstate-item: implement `from_p2` in a simpler way
Closed	marmoute	D11367 dirstate-item: implement `merged` in a simpler way
Closed	marmoute	D11366 dirstate-item: implement `added` in a simpler way
Closed	marmoute	D11365 dirstate-item: implement `tracked` in a simpler way
Closed	marmoute	D11364 dirstate-item: keep the full information in memory (for pure form)
Closed	marmoute	D11363 dirstate-item: have all the logic go through the v1_ accessors
Closed	marmoute	D11362 dirstate-item: drop the deprecated __getitem__ variante

Diff 30162


	@property			@property
	def merged_removed(self):			def merged_removed(self):
	"""True if the file has been removed, but was "merged" initially			"""True if the file has been removed, but was "merged" initially

	This property seems like an abstraction leakage and should probably be			This property seems like an abstraction leakage and should probably be
	dealt in this class (or maybe the dirstatemap) directly.			dealt in this class (or maybe the dirstatemap) directly.
	"""			"""
	return self.v1_state() == b'r' and self.v1_size() == NONNORMAL			return self.removed and self._merged

	@property			@property
	def dm_nonnormal(self):			def dm_nonnormal(self):
	"""True is the entry is non-normal in the dirstatemap sense			"""True is the entry is non-normal in the dirstatemap sense

	There is no reason for any code, but the dirstatemap one to use this.			There is no reason for any code, but the dirstatemap one to use this.
	"""			"""
	return self.v1_state() != b'n' or self.v1_mtime() == AMBIGUOUS_TIME			return self.v1_state() != b'n' or self.v1_mtime() == AMBIGUOUS_TIME