This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: remove a update_file's special case for `merged` file
AbandonedPublic

Authored by marmoute on Oct 1 2021, 2:39 PM.

Download Raw Diff

Details

Reviewers

Alphare
pulkit

Group Reviewers

hg-reviewers

Summary

This case was fishy and can be dealt with by passing more accurate data a higher
level.

This clarify the API and prepare for a larger rework of the data we feeds to
the dirstate.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

marmoute created this revision.Oct 1 2021, 2:39 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 1 2021, 2:39 PM

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

marmoute added a child revision: D11552: dirstate-item: drop an outdated comments.Oct 1 2021, 2:40 PM

Alphare accepted this revision.Oct 1 2021, 4:25 PM

This revision is now accepted and ready to land.Oct 1 2021, 4:25 PM

pulkit accepted this revision.Oct 12 2021, 9:25 AM

apparently already queued but phabricator is confused.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/dirstatemap.py (10 lines)
M			mercurial/mergestate.py (9 lines)

Commit	Parents	Author	Summary	Date
ba9e72dd99bd	0cd4c9dc5ee7	Pierre-Yves David		Sep 30 2021, 6:00 PM

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 30508

mercurial/dirstatemap.py

	self.copymap.pop(filename, None)			self.copymap.pop(filename, None)

	if not (p1_tracked or p2_tracked or wc_tracked):			if not (p1_tracked or p2_tracked or wc_tracked):
	old_entry = self._map.pop(filename, None)			old_entry = self._map.pop(filename, None)
	self._dirs_decr(filename, old_entry=old_entry)			self._dirs_decr(filename, old_entry=old_entry)
	self.copymap.pop(filename, None)			self.copymap.pop(filename, None)
	return			return
	elif merged:			elif merged:
	# XXX might be merged and removed ?			pass
	entry = self.get(filename)
	if entry is None or not entry.tracked:
	# XXX mostly replicate dirstate.other parent. We should get
	# the higher layer to pass us more reliable data where `merged`
	# actually mean merged. Dropping this clause will show failure
	# in `test-graft.t`
	merged = False
	clean_p2 = True
	elif not (p1_tracked or p2_tracked) and wc_tracked:			elif not (p1_tracked or p2_tracked) and wc_tracked:
	pass # file is added, nothing special to adjust			pass # file is added, nothing special to adjust
	elif (p1_tracked or p2_tracked) and not wc_tracked:			elif (p1_tracked or p2_tracked) and not wc_tracked:
	pass			pass
	elif clean_p2 and wc_tracked:			elif clean_p2 and wc_tracked:
	pass			pass
	elif not p1_tracked and p2_tracked and wc_tracked:			elif not p1_tracked and p2_tracked and wc_tracked:
	clean_p2 = True			clean_p2 = True

mercurial/mergestate.py

	)			)

	# merge			# merge
	for f, args, msg in actions.get(ACTION_MERGE, []):			for f, args, msg in actions.get(ACTION_MERGE, []):
	f1, f2, fa, move, anc = args			f1, f2, fa, move, anc = args
	if branchmerge:			if branchmerge:
	# We've done a branch merge, mark this file as merged			# We've done a branch merge, mark this file as merged
	# so that we properly record the merger later			# so that we properly record the merger later
				p1_tracked = f1 == f
				p2_tracked = f2 == f
	repo.dirstate.update_file(			repo.dirstate.update_file(
	f, p1_tracked=True, wc_tracked=True, merged=True			f,
				p1_tracked=p1_tracked,
				p2_tracked=p2_tracked,
				wc_tracked=True,
				merged=p1_tracked,
				clean_p2=not p1_tracked,
	)			)
	if f1 != f2: # copy/rename			if f1 != f2: # copy/rename
	if move:			if move:
	repo.dirstate.update_file(			repo.dirstate.update_file(
	f1, p1_tracked=True, wc_tracked=False			f1, p1_tracked=True, wc_tracked=False
	)			)
	if f1 != f:			if f1 != f:
	repo.dirstate.copy(f1, f)			repo.dirstate.copy(f1, f)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	30508			Oct 1 2021, 2:39 PM	★	★