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 30540

mercurial/scmutil.py



	def dirstatecopy(ui, repo, wctx, src, dst, dryrun=False, cwd=None):			def dirstatecopy(ui, repo, wctx, src, dst, dryrun=False, cwd=None):
	"""Update the dirstate to reflect the intent of copying src to dst. For			"""Update the dirstate to reflect the intent of copying src to dst. For
	different reasons it might not end with dst being marked as copied from src.			different reasons it might not end with dst being marked as copied from src.
	"""			"""
	origsrc = repo.dirstate.copied(src) or src			origsrc = repo.dirstate.copied(src) or src
	if dst == origsrc: # copying back a copy?			if dst == origsrc: # copying back a copy?
	if repo.dirstate[dst] not in b'mn' and not dryrun:			entry = repo.dirstate.get_entry(dst)
				if (entry.added or not entry.tracked) and not dryrun:
	repo.dirstate.set_tracked(dst)			repo.dirstate.set_tracked(dst)
	else:			else:
	if repo.dirstate[origsrc] == b'a' and origsrc == src:			if repo.dirstate.get_entry(origsrc).added and origsrc == src:
	if not ui.quiet:			if not ui.quiet:
	ui.warn(			ui.warn(
	_(			_(
	b"%s has not been committed yet, so no copy "			b"%s has not been committed yet, so no copy "
	b"data will be stored for %s.\n"			b"data will be stored for %s.\n"
	)			)
	% (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd))			% (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd))
	)			)
	if repo.dirstate[dst] in b'?r' and not dryrun:			if not repo.dirstate.get_entry(dst).tracked and not dryrun:
	wctx.add([dst])			wctx.add([dst])
	elif not dryrun:			elif not dryrun:
	wctx.copy(origsrc, dst)			wctx.copy(origsrc, dst)


	def movedirstate(repo, newctx, match=None):			def movedirstate(repo, newctx, match=None):
	"""Move the dirstate to newctx and adjust it as necessary.			"""Move the dirstate to newctx and adjust it as necessary.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30467		Oct 1 2021, 5:40 AM	★	★
Diff 2	30540	rHG8f452fecd0a48104d666ec234be29e9ec60593d6	Sep 29 2021, 12:36 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: use item's property when computing a copiesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30540

mercurial/scmutil.py

dirstate-item: use item's property when computing a copies
ClosedPublic

Revision Contents
Changeset List