This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	29981		Aug 21 2021, 5:57 AM	★	★
Diff 2	30058		Aug 26 2021, 9:01 AM	★	★
Diff 3	30101	rHGbbae583333e905b262d2a4e627ddeaa449ca92ee	Aug 20 2021, 10:12 AM	★	★

Commit	Parents	Author	Summary	Date
0b5a512bcad3	6fcb411eb112	Pierre-Yves David		Aug 20 2021, 10:12 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 29981

mercurial/dirstatemap.py

	size = size & rangemask			size = size & rangemask
	mtime = mtime & rangemask			mtime = mtime & rangemask
	new_entry = DirstateItem.new_normal(mode, size, mtime)			new_entry = DirstateItem.new_normal(mode, size, mtime)
	old_entry = self.get(f)			old_entry = self.get(f)
	self._dirs_incr(f, old_entry)			self._dirs_incr(f, old_entry)
	self._map[f] = new_entry			self._map[f] = new_entry
	if new_entry.dm_nonnormal:			if new_entry.dm_nonnormal:
	self.nonnormalset.add(f)			self.nonnormalset.add(f)
				else:
				self.nonnormalset.discard(f)
	if new_entry.dm_otherparent:			if new_entry.dm_otherparent:
	self.otherparentset.add(f)			self.otherparentset.add(f)
				else:
				self.otherparentset.discard(f)

	def reset_state(			def reset_state(
	self,			self,
	filename,			filename,
	wc_tracked,			wc_tracked,
	p1_tracked,			p1_tracked,
	p2_tracked=False,			p2_tracked=False,
	merged=False,			merged=False,

This is an archive of the discontinued Mercurial Phabricator instance.

dirstatemap: also discard item from setsClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 29981

mercurial/dirstatemap.py

dirstatemap: also discard item from sets
ClosedPublic

Revision Contents
Changeset List