This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11325

dirstatemap: use the default code to handle "p2-tracked" case
ClosedPublic

Authored by marmoute on Aug 21 2021, 5:56 AM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG40cf4b278f8f: dirstatemap: use the default code to handle "p2-tracked" case

Summary

We juste have to do minor value adjustement and the default code will do the rest.

This kind of change highglight that "clean_p2" is probably not the right name,
for that value. However this is all thing to be figured out and cleaned up once
are done moving logic at lower level.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

marmoute created this revision.Aug 21 2021, 5:56 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 21 2021, 5:56 AM

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

marmoute added a child revision: D11326: dirstatemap: use the default code to handle "clean-p2" case.Aug 21 2021, 5:57 AM

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

Alphare accepted this revision.Aug 26 2021, 9:11 AM

This revision is now accepted and ready to land.Aug 26 2021, 9:11 AM

marmoute added a commit: rHG40cf4b278f8f: dirstatemap: use the default code to handle "p2-tracked" case.Aug 27 2021, 8:38 AM

Closed by commit rHG40cf4b278f8f: dirstatemap: use the default code to handle "p2-tracked" case (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/dirstatemap.py (3 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	29974		Aug 21 2021, 5:56 AM	★	★
Diff 2	30051		Aug 26 2021, 9:01 AM	★	★
Diff 3	30093	rHG40cf4b278f8f4a0ab434fa101ef03fd7108f3fac	Jul 16 2021, 11:14 AM	★	★

Commit	Parents	Author	Summary	Date
25452d8c5b91	df3eb9983b4a	Pierre-Yves David		Jul 16 2021, 11:14 AM

Status	Author	Revision
Closed	marmoute	D11353 dirstate: drop the `_otherparent` method
Closed	marmoute	D11352 dirstate: drop the `_normal` method
Closed	marmoute	D11351 dirstate: drop the `_merge` method
Closed	marmoute	D11350 dirstate: drop the deprecated `drop` method
Closed	marmoute	D11349 dirstate: drop the deprecated `merge` method
Closed	marmoute	D11348 dirstate: drop the deprecated `remove` method
Closed	marmoute	D11347 dirstate: drop the deprecated `add` method
Closed	marmoute	D11346 dirstate: drop the deprecated `otherparent` method
Closed	marmoute	D11345 dirstate: drop the deprecated `normallookup` method
Closed	marmoute	D11344 dirstate: drop the deprecated `normal` method
Closed	marmoute	D11343 dirstate: also wrap the new method in `dirstatenonnormalcheck`
Closed	marmoute	D11332 dirstatemap: also discard item from sets
Closed	marmoute	D11331 dirstatemap: drop unused internal constant definition
Closed	marmoute	D11330 dirstate-item: add dedicated "legacy" constructor for `addfile` case
Closed	marmoute	D11329 dirstatemap: use the default code to handle "merged" case
Closed	marmoute	D11328 dirstatemap: use the default code to handle "added" case
Closed	marmoute	D11327 dirstatemap: use the default code to handle "removed" case
Closed	marmoute	D11326 dirstatemap: use the default code to handle "clean-p2" case
Closed	marmoute	D11325 dirstatemap: use the default code to handle "p2-tracked" case
Closed	marmoute	D11324 dirstatemap: use the default code to handle "possibly_dirty" case
Closed	marmoute	D11323 dirstatemap: use the default code to handle normal entry
Closed	marmoute	D11322 dirstatemap: conclude `reset_state` with logic using the new __init__
Closed	marmoute	D11321 dirstatemap: temporarily return early in `reset_state`
Closed	marmoute	D11320 dirstate-item: feed more information to `__init__`
Closed	marmoute	D11319 rust-dirstatemap: temporarily use `from_v1_data` in `addfile`
Closed	marmoute	D11318 dirstatemap: temporarily use `from_v1_data` in `addfile`
Closed	marmoute	D11317 dirstate-item: fix the declaration of the Cext `from_v1_meth`
Closed	marmoute	D11316 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent
Closed	marmoute	D11315 dirstatemap: replace `removefile` by an explicit `entry.set_untracked()`
Closed	marmoute	D11314 dirstate: forward `remove` call to newer `API`
Closed	marmoute	D11313 dirstate: directly call the dirstatemap in `set_untracked`

Diff 29974

mercurial/dirstatemap.py

	# as merged without actually being the result of a merge			# as merged without actually being the result of a merge
	# action. So thing are not ideal here.			# action. So thing are not ideal here.
	self.addfile(filename, merged=True)			self.addfile(filename, merged=True)
	return			return
	else:			else:
	self.addfile(filename, from_p2=True)			self.addfile(filename, from_p2=True)
	return			return
	elif not p1_tracked and p2_tracked and wc_tracked:			elif not p1_tracked and p2_tracked and wc_tracked:
	self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty)			clean_p2 = True
	return
	elif possibly_dirty:			elif possibly_dirty:
	pass			pass
	elif wc_tracked:			elif wc_tracked:
	# this is a "normal" file			# this is a "normal" file
	if parentfiledata is None:			if parentfiledata is None:
	msg = b'failed to pass parentfiledata for a normal file: %s'			msg = b'failed to pass parentfiledata for a normal file: %s'
	msg %= filename			msg %= filename
	raise error.ProgrammingError(msg)			raise error.ProgrammingError(msg)