This is an archive of the discontinued Mercurial Phabricator instance.

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 30541

mercurial/cmdutil.py

	mergeadd.remove(path)			mergeadd.remove(path)
	dsadded \|= mergeadd			dsadded \|= mergeadd
	dsmodified -= mergeadd			dsmodified -= mergeadd

	# if f is a rename, update `names` to also revert the source			# if f is a rename, update `names` to also revert the source
	for f in localchanges:			for f in localchanges:
	src = repo.dirstate.copied(f)			src = repo.dirstate.copied(f)
	# XXX should we check for rename down to target node?			# XXX should we check for rename down to target node?
	if src and src not in names and repo.dirstate[src] == b'r':			if (
				src
				and src not in names
				and repo.dirstate.get_entry(src).removed
				):
	dsremoved.add(src)			dsremoved.add(src)
	names[src] = True			names[src] = True

	# determine the exact nature of the deleted changesets			# determine the exact nature of the deleted changesets
	deladded = set(_deleted)			deladded = set(_deleted)
	for path in _deleted:			for path in _deleted:
	if path in mf:			if path in mf:
	deladded.remove(path)			deladded.remove(path)
	deleted = _deleted - deladded			deleted = _deleted - deladded

	# distinguish between file to forget and the other			# distinguish between file to forget and the other
	added = set()			added = set()
	for abs in dsadded:			for abs in dsadded:
	if repo.dirstate[abs] != b'a':			if not repo.dirstate.get_entry(abs).added:
	added.add(abs)			added.add(abs)
	dsadded -= added			dsadded -= added

	for abs in deladded:			for abs in deladded:
	if repo.dirstate[abs] == b'a':			if repo.dirstate.get_entry(abs).added:
	dsadded.add(abs)			dsadded.add(abs)
	deladded -= dsadded			deladded -= dsadded

	# For files marked as removed, we check if an unknown file is present at			# For files marked as removed, we check if an unknown file is present at
	# the same path. If a such file exists it may need to be backed up.			# the same path. If a such file exists it may need to be backed up.
	# Making the distinction at this stage helps have simpler backup			# Making the distinction at this stage helps have simpler backup
	# logic.			# logic.
	removunk = set()			removunk = set()

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30468		Oct 1 2021, 5:40 AM	★	★
Diff 2	30541	rHGe8d6261513b99ea73c12ef3da8900d79d17bf430	Sep 29 2021, 12:37 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: use item's property instead of `state` in revertClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30541

mercurial/cmdutil.py

dirstate-item: use item's property instead of `state` in revert
ClosedPublic

Revision Contents
Changeset List