This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10977

dirstate: drop the last explicit `state` usage in the module
ClosedPublic

Authored by marmoute on Jul 4 2021, 5:52 PM.

Download Raw Diff

Tags

None

Subscribers

Alphare, SimonSapin, mercurial-patches

Details

Reviewers

Group Reviewers

Commits

rHG811a79bfb8bb: dirstate: drop the last explicit `state` usage in the module

Summary

The internal detail of the state bytes is not longer exposed to the dirstate
layer.

Diff Detail

Repository

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.Jul 4 2021, 5:52 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJul 4 2021, 5:52 PM

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

marmoute added a child revision: D10978: dirstate: no longer pass `oldstate` to the `dropfile`.Jul 4 2021, 5:52 PM

Is this the same? Or could this entry be "added" or "merged" instead of just "normal"?

The test doesn't bark and this seems fine.

If this is merged, this will be fine, since we would overwrite merged with merged,

This would not be added since this function is called file that exists during a merge/update.

✅ refresh by Heptapod after a successful CI run (🐙 💚)

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a child revision: D10983: dirstate-item: also build DistateItem in dirstate.directories().Jul 6 2021, 8:12 PM

Agreed, this ends up being technically more correct (even though it doesn't matter).

This revision is now accepted and ready to land.Jul 8 2021, 10:49 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG811a79bfb8bb: dirstate: drop the last explicit `state` usage in the module.Jul 8 2021, 12:06 PM

Closed by commit rHG811a79bfb8bb: dirstate: drop the last explicit `state` usage in the module (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 (3 lines)

Diff 29016

mercurial/dirstate.py

	self._addpath(f, possibly_dirty=True)			self._addpath(f, possibly_dirty=True)
	self._map.copymap.pop(f, None)			self._map.copymap.pop(f, None)

	def otherparent(self, f):			def otherparent(self, f):
	'''Mark as coming from the other parent, always dirty.'''			'''Mark as coming from the other parent, always dirty.'''
	if not self.in_merge:			if not self.in_merge:
	msg = _(b"setting %r to other parent only allowed in merges") % f			msg = _(b"setting %r to other parent only allowed in merges") % f
	raise error.Abort(msg)			raise error.Abort(msg)
	if f in self and self[f] == b'n':			entry = self._map.get(f)
				if entry is not None and entry.tracked:
	# merge-like			# merge-like
	self._addpath(f, merged=True)			self._addpath(f, merged=True)
	else:			else:
	# add-like			# add-like
	self._addpath(f, from_p2=True)			self._addpath(f, from_p2=True)
	self._map.copymap.pop(f, None)			self._map.copymap.pop(f, None)

	def add(self, f):			def add(self, f):