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 30526

mercurial/debugcommands.py


	@command(b'debugcheckstate', [], b'')			@command(b'debugcheckstate', [], b'')
	def debugcheckstate(ui, repo):			def debugcheckstate(ui, repo):
	"""validate the correctness of the current dirstate"""			"""validate the correctness of the current dirstate"""
	parent1, parent2 = repo.dirstate.parents()			parent1, parent2 = repo.dirstate.parents()
	m1 = repo[parent1].manifest()			m1 = repo[parent1].manifest()
	m2 = repo[parent2].manifest()			m2 = repo[parent2].manifest()
	errors = 0			errors = 0
	for f in repo.dirstate:			for err in repo.dirstate.verify(m1, m2):
	state = repo.dirstate[f]			ui.warn(err[0] % err[1:])
	if state in b"nr" and f not in m1:
	ui.warn(_(b"%s in state %s, but not in manifest1\n") % (f, state))
	errors += 1
	if state in b"a" and f in m1:
	ui.warn(_(b"%s in state %s, but also in manifest1\n") % (f, state))
	errors += 1
	if state in b"m" and f not in m1 and f not in m2:
	ui.warn(
	_(b"%s in state %s, but not in either manifest\n") % (f, state)
	)
	errors += 1
	for f in m1:
	state = repo.dirstate[f]
	if state not in b"nrm":
	ui.warn(_(b"%s in manifest1, but listed as state %s") % (f, state))
	errors += 1			errors += 1
	if errors:			if errors:
	errstr = _(b".hg/dirstate inconsistent with current parent's manifest")			errstr = _(b".hg/dirstate inconsistent with current parent's manifest")
	raise error.Abort(errstr)			raise error.Abort(errstr)


	@command(			@command(
	b'debugcolor',			b'debugcolor',
	[(b'', b'style', None, _(b'show all configured styles'))],			[(b'', b'style', None, _(b'show all configured styles'))],

mercurial/dirstate.py

	if util.samefile(o.join(backupname), o.join(filename)):			if util.samefile(o.join(backupname), o.join(filename)):
	o.unlink(backupname)			o.unlink(backupname)
	else:			else:
	o.rename(backupname, filename, checkambig=True)			o.rename(backupname, filename, checkambig=True)

	def clearbackup(self, tr, backupname):			def clearbackup(self, tr, backupname):
	'''Clear backup file'''			'''Clear backup file'''
	self._opener.unlink(backupname)			self._opener.unlink(backupname)

				def verify(self, m1, m2):
				"""check the dirstate content again the parent manifest and yield errors"""
				missing_from_p1 = b"%s in state %s, but not in manifest1\n"
				unexpected_in_p1 = b"%s in state %s, but also in manifest1\n"
				missing_from_ps = b"%s in state %s, but not in either manifest\n"
				missing_from_ds = b"%s in manifest1, but listed as state %s\n"
				for f, entry in self.items():
				state = entry.state
				if state in b"nr" and f not in m1:
				yield (missing_from_p1, f, state)
				if state in b"a" and f in m1:
				yield (unexpected_in_p1, f, state)
				if state in b"m" and f not in m1 and f not in m2:
				yield (missing_from_ps, f, state)
				for f in m1:
				state = self.get_entry(f).state
				if state not in b"nrm":
				yield (missing_from_ds, f, state)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30453		Oct 1 2021, 5:38 AM	★	★
Diff 2	30526	rHGc87844960a3537ee0f341012cd689726c2506cad	Sep 30 2021, 6:00 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: move verification code within the dirstate itselfClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30526

mercurial/debugcommands.py

mercurial/dirstate.py

dirstate: move verification code within the dirstate itself
ClosedPublic

Revision Contents
Changeset List