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 30539

mercurial/cmdutil.py

	if b'/' in abstarget:			if b'/' in abstarget:
	# We cannot normalize abstarget itself, this would prevent			# We cannot normalize abstarget itself, this would prevent
	# case only renames, like a => A.			# case only renames, like a => A.
	abspath, absname = abstarget.rsplit(b'/', 1)			abspath, absname = abstarget.rsplit(b'/', 1)
	abstarget = repo.dirstate.normalize(abspath) + b'/' + absname			abstarget = repo.dirstate.normalize(abspath) + b'/' + absname
	reltarget = repo.pathto(abstarget, cwd)			reltarget = repo.pathto(abstarget, cwd)
	target = repo.wjoin(abstarget)			target = repo.wjoin(abstarget)
	src = repo.wjoin(abssrc)			src = repo.wjoin(abssrc)
	state = repo.dirstate[abstarget]			entry = repo.dirstate.get_entry(abstarget)

				already_commited = entry.tracked and not entry.added

	scmutil.checkportable(ui, abstarget)			scmutil.checkportable(ui, abstarget)

	# check for collisions			# check for collisions
	prevsrc = targets.get(abstarget)			prevsrc = targets.get(abstarget)
	if prevsrc is not None:			if prevsrc is not None:
	ui.warn(			ui.warn(
	_(b'%s: not overwriting - %s collides with %s\n')			_(b'%s: not overwriting - %s collides with %s\n')
	abstarget			abstarget
	):			):
	if not rename:			if not rename:
	ui.warn(_(b"%s: can't copy - same file\n") % reltarget)			ui.warn(_(b"%s: can't copy - same file\n") % reltarget)
	return True # report a failure			return True # report a failure
	exists = False			exists = False
	samefile = True			samefile = True

	if not after and exists or after and state in b'mn':			if not after and exists or after and already_commited:
	if not opts[b'force']:			if not opts[b'force']:
	if state in b'mn':			if already_commited:
	msg = _(b'%s: not overwriting - file already committed\n')			msg = _(b'%s: not overwriting - file already committed\n')
	if after:			if after:
	flags = b'--after --force'			flags = b'--after --force'
	else:			else:
	flags = b'--force'			flags = b'--force'
	if rename:			if rename:
	hint = (			hint = (
	_(			_(

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30466		Oct 1 2021, 5:39 AM	★	★
Diff 2	30539	rHG304267b077de62b8191a5a7218193c3a672b5d11	Sep 29 2021, 12:32 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

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

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30539

mercurial/cmdutil.py

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

Revision Contents
Changeset List