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 30536

mercurial/cmdutil.py

	return commitfunc(ui, repo, newfiles, *pycompat.strkwargs(opts))			return commitfunc(ui, repo, newfiles, *pycompat.strkwargs(opts))
	finally:			finally:
	# 5. finally restore backed-up files			# 5. finally restore backed-up files
	try:			try:
	dirstate = repo.dirstate			dirstate = repo.dirstate
	for realname, tmpname in pycompat.iteritems(backups):			for realname, tmpname in pycompat.iteritems(backups):
	ui.debug(b'restoring %r to %r\n' % (tmpname, realname))			ui.debug(b'restoring %r to %r\n' % (tmpname, realname))

	if dirstate[realname] == b'n':			if dirstate.get_entry(realname).maybe_clean:
	# without normallookup, restoring timestamp			# without normallookup, restoring timestamp
	# may cause partially committed files			# may cause partially committed files
	# to be treated as unmodified			# to be treated as unmodified

	# XXX-PENDINGCHANGE: We should clarify the context in			# XXX-PENDINGCHANGE: We should clarify the context in
	# which this function is called to make sure it			# which this function is called to make sure it
	# already called within a `pendingchange`, However we			# already called within a `pendingchange`, However we
	# are taking a shortcut here in order to be able to			# are taking a shortcut here in order to be able to

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30464		Oct 1 2021, 5:39 AM	★	★
Diff 2	30536	rHG571dd808c6c8c29f16b32ff035e4141c4f1b0011	Sep 29 2021, 11:42 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: use `maybe_clean` instead of `state` in recordClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30536

mercurial/cmdutil.py

dirstate-item: use `maybe_clean` instead of `state` in record
ClosedPublic

Revision Contents
Changeset List