In D10988#167831, @SimonSapin wrote:

Will be affected if D10983 is changed as suggested, but if not looks good.
Do we need to preserve compatibility with earlier Mercurial versions, for debug* commands?

We don't enforce backward compat on debug command.

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax added a child revision: D10992: dirstate-item: deprecate tuple access on the class.Jul 8 2021, 11:04 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Jul 9 2021, 11:12 AM

This revision is now accepted and ready to land.Jul 9 2021, 11:12 AM

marmoute added a commit: rHG85ce6ed51b9c: dirstate-item: use the v1_serialization method in debugstate.Jul 9 2021, 1:19 PM

Closed by commit rHG85ce6ed51b9c: dirstate-item: use the v1_serialization method in debugstate (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	28809		Jul 5 2021, 5:34 AM	★	★
Diff 2	28843		Jul 6 2021, 1:35 PM	★	★
Diff 3	28925		Jul 7 2021, 8:00 AM	★	★
Diff 4	29010		Jul 8 2021, 11:04 AM	★	★
Diff 5	29022		Jul 8 2021, 2:27 PM	★	★
Diff 6	29047	rHG85ce6ed51b9cf407591730cd5533993176fcbd85	Jul 5 2021, 12:44 AM	★	★

	"""show the contents of the current dirstate"""			"""show the contents of the current dirstate"""

	nodates = not opts['dates']			nodates = not opts['dates']
	if opts.get('nodates') is not None:			if opts.get('nodates') is not None:
	nodates = True			nodates = True
	datesort = opts.get('datesort')			datesort = opts.get('datesort')

	if datesort:			if datesort:
	keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename			keyfunc = lambda x: (
				x[1].v1_mtime(),
				x[0],
				) # sort by mtime, then by filename
	else:			else:
	keyfunc = None # sort by filename			keyfunc = None # sort by filename
	entries = list(pycompat.iteritems(repo.dirstate))			entries = list(pycompat.iteritems(repo.dirstate))
	if opts['dirs']:			if opts['dirs']:
	entries.extend(repo.dirstate.directories())			entries.extend(repo.dirstate.directories())
	entries.sort(key=keyfunc)			entries.sort(key=keyfunc)
	for file_, ent in entries:			for file_, ent in entries:
	if ent[3] == -1:			if ent.v1_mtime() == -1:
	timestr = b'unset '			timestr = b'unset '
	elif nodates:			elif nodates:
	timestr = b'set '			timestr = b'set '
	else:			else:
	timestr = time.strftime(			timestr = time.strftime(
	"%Y-%m-%d %H:%M:%S ", time.localtime(ent[3])			"%Y-%m-%d %H:%M:%S ", time.localtime(ent.v1_mtime())
	)			)
	timestr = encoding.strtolocal(timestr)			timestr = encoding.strtolocal(timestr)
	if ent[1] & 0o20000:			if ent.mode & 0o20000:
	mode = b'lnk'			mode = b'lnk'
	else:			else:
	mode = b'%3o' % (ent[1] & 0o777 & ~util.umask)			mode = b'%3o' % (ent.v1_mode() & 0o777 & ~util.umask)
	ui.write(b"%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))			ui.write(
				b"%c %s %10d %s%s\n"
				% (ent.v1_state(), mode, ent.v1_size(), timestr, file_)
				)
	for f in repo.dirstate.copies():			for f in repo.dirstate.copies():
	ui.write(_(b"copy: %s -> %s\n") % (repo.dirstate.copied(f), f))			ui.write(_(b"copy: %s -> %s\n") % (repo.dirstate.copied(f), f))


	@command(			@command(
	b'debugdiscovery',			b'debugdiscovery',
	[			[
	(b'', b'old', None, _(b'use old-style discovery')),			(b'', b'old', None, _(b'use old-style discovery')),

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: use the v1_serialization method in debugstate
ClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 28925

mercurial/debugcommands.py