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 30469

mercurial/scmutil.py

	oldcopies = copiesmod.pathcopies(newctx, oldctx, match)			oldcopies = copiesmod.pathcopies(newctx, oldctx, match)
	oldcopies.update(copies)			oldcopies.update(copies)
	copies = {			copies = {
	dst: oldcopies.get(src, src)			dst: oldcopies.get(src, src)
	for dst, src in pycompat.iteritems(oldcopies)			for dst, src in pycompat.iteritems(oldcopies)
	}			}
	# Adjust the dirstate copies			# Adjust the dirstate copies
	for dst, src in pycompat.iteritems(copies):			for dst, src in pycompat.iteritems(copies):
	if src not in newctx or dst in newctx or ds[dst] != b'a':			if src not in newctx or dst in newctx or not ds.get_entry(dst).added:
	src = None			src = None
	ds.copy(src, dst)			ds.copy(src, dst)
	repo._quick_access_changeid_invalidate()			repo._quick_access_changeid_invalidate()


	def filterrequirements(requirements):			def filterrequirements(requirements):
	"""filters the requirements into two sets:			"""filters the requirements into two sets:

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30469		Oct 1 2021, 5:40 AM	★	★
Diff 2	30542	rHG207df24a31f6b698a6966ef2b05787caed8b3598	Sep 29 2021, 12:37 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: use `added` instead of `state` when moving dirstateClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30469

mercurial/scmutil.py

dirstate-item: use `added` instead of `state` when moving dirstate
ClosedPublic

Revision Contents
Changeset List