This is an archive of the discontinued Mercurial Phabricator instance.

hgext/remotefilelog/debugcommands.py
280	It was changed to `%d` because `%s % int` does not work on Python 3. I think `%s % pycompat.bytestr(blobsize)` should work on both python versions.

spectral updated this revision to Diff 14249.Feb 26 2019, 4:44 PM

spectral marked an inline comment as done.Feb 26 2019, 4:46 PM

spectral added inline comments.

hgext/remotefilelog/debugcommands.py
280	Changed to use pycompat.bytestr

spectral marked an inline comment as done.Feb 26 2019, 5:12 PM

Closed by commit rHG941685500125: remotefilelog: fix format str, blobsize isn't always a #, can be "(missing)" (authored by spectral). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/remotefilelog/debugcommands.py (5 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	14243		Feb 25 2019, 6:59 PM	★	★
Diff 2	14249		Feb 26 2019, 4:44 PM	★	★
Diff 3	14250	rHG941685500125d3f2a4c0d104a3d5b09c17827c08	Feb 25 2019, 3:42 PM	★	★

Commit	Parents	Author	Summary	Date
		Kyle Lippincott		Feb 25 2019, 3:42 PM

Diff 14249

hgext/remotefilelog/debugcommands.py

	import zlib			import zlib

	from mercurial.node import bin, hex, nullid, short			from mercurial.node import bin, hex, nullid, short
	from mercurial.i18n import _			from mercurial.i18n import _
	from mercurial import (			from mercurial import (
	error,			error,
	filelog,			filelog,
	node as nodemod,			node as nodemod,
				pycompat,
	revlog,			revlog,
	)			)
	from . import (			from . import (
	constants,			constants,
	datapack,			datapack,
	extutil,			extutil,
	fileserverclient,			fileserverclient,
	historypack,			historypack,
	# Metadata could be missing, in which case it will be an empty dict.			# Metadata could be missing, in which case it will be an empty dict.
	meta = dpack.getmeta(filename, node)			meta = dpack.getmeta(filename, node)
	if constants.METAKEYSIZE in meta:			if constants.METAKEYSIZE in meta:
	blobsize = meta[constants.METAKEYSIZE]			blobsize = meta[constants.METAKEYSIZE]
	totaldeltasize += deltalen			totaldeltasize += deltalen
	totalblobsize += blobsize			totalblobsize += blobsize
	else:			else:
	blobsize = "(missing)"			blobsize = "(missing)"
	ui.write("%s %s %s%d\n" % (			ui.write("%s %s %s%s\n" % (
				pulkitUnsubmitted Done It was changed to `%d` because `%s % int` does not work on Python 3. I think `%s % pycompat.bytestr(blobsize)` should work on both python versions. pulkit: It was changed to `%d` because `%s % int` does not work on Python 3. I think `%s % pycompat.
				spectralAuthorUnsubmitted Not Done Changed to use pycompat.bytestr spectral: Changed to use pycompat.bytestr
	hashformatter(node),			hashformatter(node),
	hashformatter(deltabase),			hashformatter(deltabase),
	('%d' % deltalen).ljust(14),			('%d' % deltalen).ljust(14),
	blobsize))			pycompat.bytestr(blobsize)))

	if filename is not None:			if filename is not None:
	printtotals()			printtotals()

	failures += _sanitycheck(ui, set(nodes), bases)			failures += _sanitycheck(ui, set(nodes), bases)
	if failures > 1:			if failures > 1:
	ui.warn(("%d failures\n" % failures))			ui.warn(("%d failures\n" % failures))
	return 1			return 1

This is an archive of the discontinued Mercurial Phabricator instance.

remotefilelog: fix format str, blobsize isn't always a #, can be "(missing)"ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 14249

hgext/remotefilelog/debugcommands.py

remotefilelog: fix format str, blobsize isn't always a #, can be "(missing)"
ClosedPublic

Revision Contents
Changeset List