This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	29963		Aug 21 2021, 5:55 AM	★	★
Diff 2	30040		Aug 26 2021, 8:59 AM	★	★
Diff 3	30082	rHG6614ab9f061df7f99023416a16f10297e2095676	Aug 20 2021, 5:23 AM	★	★

Commit	Parents	Author	Summary	Date
8a40885ecf17	551cea8f81c2	Pierre-Yves David		Aug 20 2021, 5:23 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 29963

mercurial/dirstate.py

	)			)
	else:			else:
	util.nouideprecwarn(			util.nouideprecwarn(
	b"do not use `remove` outside of update/merge context."			b"do not use `remove` outside of update/merge context."
	b" Use `set_untracked`",			b" Use `set_untracked`",
	b'6.0',			b'6.0',
	stacklevel=2,			stacklevel=2,
	)			)
	self._remove(f)

	def _remove(self, filename):
	"""internal function to mark a file removed"""
	self._dirty = True			self._dirty = True
	self._updatedfiles.add(filename)			self._updatedfiles.add(f)
	self._map.removefile(filename, in_merge=self.in_merge)			entry = self._map.get(f)
				if entry is None:
				# Assuming we are in a update/merge case
				self.update_file(f, p1_tracked=True, wc_tracked=False)
				else:
				self.set_untracked(f)

	def merge(self, f):			def merge(self, f):
	'''Mark a file merged.'''			'''Mark a file merged.'''
	if self.pendingparentchange():			if self.pendingparentchange():
	util.nouideprecwarn(			util.nouideprecwarn(
	b"do not use `merge` inside of update/merge context."			b"do not use `merge` inside of update/merge context."
	b" Use `update_file`",			b" Use `update_file`",
	b'6.0',			b'6.0',

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: forward `remove` call to newer `API`ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 29963

mercurial/dirstate.py

dirstate: forward `remove` call to newer `API`
ClosedPublic

Revision Contents
Changeset List