This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11522

dirstate: add a `get_entry` method to the dirstate
ClosedPublic

Authored by marmoute on Oct 1 2021, 5:38 AM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG6a78715e56c8: dirstate: add a `get_entry` method to the dirstate

Summary

This method give access to the underlying DirstateEntry object (or an empty
one if None was there). It should allow us to use the more semantic property of
the entry instead of the state where we needs it.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Oct 1 2021, 5:38 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 1 2021, 5:38 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

marmoute added a child revision: D11523: dirstate-item: introduce a `maybe_clean` property.Oct 1 2021, 5:38 AM

Alphare accepted this revision.Oct 1 2021, 11:13 AM

This revision is now accepted and ready to land.Oct 1 2021, 11:13 AM

marmoute added a commit: rHG6a78715e56c8: dirstate: add a `get_entry` method to the dirstate.Oct 1 2021, 4:44 PM

Closed by commit rHG6a78715e56c8: dirstate: add a `get_entry` method to the dirstate (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/dirstate.py (7 lines)

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 30522

mercurial/dirstate.py

	consider migrating all user of this to going through the dirstate entry			consider migrating all user of this to going through the dirstate entry
	instead.			instead.
	"""			"""
	entry = self._map.get(key)			entry = self._map.get(key)
	if entry is not None:			if entry is not None:
	return entry.state			return entry.state
	return b'?'			return b'?'

				def get_entry(self, path):
				"""return a DirstateItem for the associated path"""
				entry = self._map.get(path)
				if entry is None:
				return DirstateItem()
				return entry

	def __contains__(self, key):			def __contains__(self, key):
	return key in self._map			return key in self._map

	def __iter__(self):			def __iter__(self):
	return iter(sorted(self._map))			return iter(sorted(self._map))

	def items(self):			def items(self):
	return pycompat.iteritems(self._map)			return pycompat.iteritems(self._map)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30449		Oct 1 2021, 5:38 AM	★	★
Diff 2	30522	rHG6a78715e56c85c12ba8423de95c2639c0d7df7f3	Sep 28 2021, 8:37 PM	★	★