This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Abandoned	marmoute	D11556 dirstate: push back the future a bit in the test
Abandoned	marmoute	D11555 dirstate-item: point out that `merged` is set only with p1_tracked
Abandoned	marmoute	D11554 dirstate-item: update the attribute documentation
Abandoned	marmoute	D11553 dirstate-item: use `any_tracked` more
Abandoned	marmoute	D11552 dirstate-item: drop an outdated comments
Abandoned	marmoute	D11551 dirstate: remove a update_file's special case for `merged` file
Abandoned	marmoute	D11550 dirstate: remove a update_file's special case for tracked file with p2 data
Closed	marmoute	D11544 dirstate: deprecate `__getitem__` access
Closed	marmoute	D11543 dirstate-item: use item's property instead of `state` in largefile
Closed	marmoute	D11542 dirstate-item: use `added` instead of `state` when moving dirstate
Closed	marmoute	D11541 dirstate-item: use item's property instead of `state` in revert
Closed	marmoute	D11540 dirstate-item: use item's property when computing a copies
Closed	marmoute	D11539 dirstate-item: use item's property instead of `state` in copy
Closed	marmoute	D11538 dirstate-item: use `added` in debugrebuilddirstate
Closed	marmoute	D11537 dirstate-item: use `maybe_clean` instead of `state` in record
Closed	marmoute	D11536 dirstate-item: use `any_tracked` instead of `state` to apply patches
Closed	marmoute	D11535 dirstate-item: use item's property instead of `state` in addremove
Closed	marmoute	D11534 dirstate-item: use `tracked` instead of `state` during copy detection
Closed	marmoute	D11533 dirstate-item: use `maybe_clean` instead of `state` in `strip`
Closed	marmoute	D11532 dirstate-item: use `tracked` instead of `state` in context.matches
Closed	marmoute	D11531 dirstate-item: use `tracked` instead of the `state` in context's iter
Closed	marmoute	D11530 dirstate-item: use `tracked` instead of the `state` in context
Closed	marmoute	D11529 dirstate-item: use item's property to deal with hgsubstate in mq
Closed	marmoute	D11528 dirstate-item: use `added` instead of the `state` in the `mq` extension
Closed	marmoute	D11527 dirstate-item: use maybe_clean instead of `state` in the eol extension
Closed	marmoute	D11526 dirstate: move verification code within the dirstate itself
Closed	marmoute	D11525 dirstate-entry: use `?` for the state of entry without any tracking
Closed	marmoute	D11524 dirstate-item: introduce a `any_tracked` property
Closed	marmoute	D11523 dirstate-item: introduce a `maybe_clean` property
Closed	marmoute	D11522 dirstate: add a `get_entry` method to the dirstate
Closed	marmoute	D11521 dirstate-item: Make constructor parameters optional

Diff 30511

mercurial/pure/parsers.py

	# a special value used internally for `time` if the time is ambigeous			# a special value used internally for `time` if the time is ambigeous
	AMBIGUOUS_TIME = -1			AMBIGUOUS_TIME = -1


	@attr.s(slots=True, init=False)			@attr.s(slots=True, init=False)
	class DirstateItem(object):			class DirstateItem(object):
	"""represent a dirstate entry			"""represent a dirstate entry

	It contains:			It hold multiple attributes

				# about file tracking
				- wc_tracked: is the file tracked by the working copy
				- p1_tracked: is the file tracked in working copy first parent
				- p2_tracked: is the file tracked in working copy second parent

				# about what possible merge action related to this file
				- clean_p1: merge picked the file content from p1
				- clean_p2: merge picked the file content from p2
				- merged: file gather changes from both side.

				# about the file state expected from p1 manifest:
				- mode: the file mode in p1
				- size: the file size in p1

				# about the file state on disk last time we saw it:
				- mtime: the last known clean mtime for the file.

				The last three item (mode, size and mtime) can be None if no meaningful (or
				trusted) value exists.

	- state (one of 'n', 'a', 'r', 'm')
	- mode,
	- size,
	- mtime,
	"""			"""

	_wc_tracked = attr.ib()			_wc_tracked = attr.ib()
	_p1_tracked = attr.ib()			_p1_tracked = attr.ib()
	_p2_tracked = attr.ib()			_p2_tracked = attr.ib()
	# the three item above should probably be combined			# the three item above should probably be combined
	#			#
	# However it is unclear if they properly cover some of the most advanced			# However it is unclear if they properly cover some of the most advanced

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	30511			Oct 1 2021, 2:40 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: update the attribute documentationAbandonedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30511

mercurial/pure/parsers.py

dirstate-item: update the attribute documentation
AbandonedPublic

Revision Contents
Changeset List