This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	29977		Aug 21 2021, 5:57 AM	★	★
Diff 2	30054		Aug 26 2021, 9:01 AM	★	★
Diff 3	30096	rHG6816ae362ddda5e599066440d6ed6c4d57a0bc2d	Jul 16 2021, 11:29 AM	★	★

Commit	Parents	Author	Summary	Date
455f0b610407	b58fe99710ba	Pierre-Yves David		Jul 16 2021, 11:29 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 30054

mercurial/dirstatemap.py

	# actually mean merged. Dropping the else clause will show			# actually mean merged. Dropping the else clause will show
	# failure in `test-graft.t`			# failure in `test-graft.t`
	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 or p2_tracked) and wc_tracked:			elif not (p1_tracked or p2_tracked) and wc_tracked:
	self.addfile(filename, added=True, possibly_dirty=possibly_dirty)			pass # file is added, nothing special to adjust
	return
	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:
	if p1_tracked or self.get(filename) is not None:			if p1_tracked or self.get(filename) is not None:
	# XXX the `self.get` call is catching some case in			# XXX the `self.get` call is catching some case in
	# `test-merge-remove.t` where the file is tracked in p1, the			# `test-merge-remove.t` where the file is tracked in p1, the
	# p1_tracked argument is False.			# p1_tracked argument is False.
	#			#

This is an archive of the discontinued Mercurial Phabricator instance.

dirstatemap: use the default code to handle "added" caseClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30054

mercurial/dirstatemap.py

dirstatemap: use the default code to handle "added" case
ClosedPublic

Revision Contents
Changeset List