This is an archive of the discontinued Mercurial Phabricator instance.

I was under the impression that that was more of a hack, mainly useful for when there are lots of existing opts.get(b'') uses in a file, and when there are a few it was better to change to r''. Is it preferred to always use that then?

I was under the impression that that was more of a hack, mainly useful for when there are lots of existing `opts.get(b'')` uses in a file, and when there are a few it was better to change to `r''`.

Correct. And I feel there are lots of s/b''/r''/s in this patch.

Switch to using pycompat.byteskwargs.

Closed by commit rHG51ba9fbcca52: py3: use pycompat.byteskwargs on opts in phabricator.py (authored by Kwan). · Explain WhyMar 16 2019, 9:39 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/phabricator.py (3 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	14420		Mar 8 2019, 10:01 PM	★	★
Diff 2	14522		Mar 16 2019, 7:52 AM	★	★
Diff 3	14530	rHG51ba9fbcca5245b308d8d588137a3d5483b7b688	Mar 8 2019, 1:30 PM	★	★

Status	Author	Revision
Closed	Kwan	D6114 py3: add test-phabricator.py to python3-whitelist
Closed	Kwan	D6113 py3: convert to/from bytes/unicode for json.(dump\|load)s in debugcallconduit
Closed	Kwan	D6112 py3: use % instead of .format() on a bytestring
Closed	Kwan	D6111 py3: use r'' for group name arguments to MatchObjects in phabricator.py
Closed	Kwan	D6110 py3: use %d instead of %s when formatting an int into a byte string
Closed	Kwan	D6109 py3: only pass unicode to json.dumps in writediffproperties
Closed	Kwan	D6108 py3: fix a few "dict keys as str instead of bytes" issues in phabricator.py
Closed	Kwan	D6107 py3: use pycompat.byteskwargs on opts in phabricator.py
Closed	Kwan	D6106 py3: convert URL to str before passing it to request
Closed	Kwan	D6105 py3: convert indexes into bytes when enumerating lists in urlencodenested
Closed	Kwan	D6104 py3: don't try and format a bare dict into a byte string in callconduit
Closed	Kwan	D6103 py3: use pycompat.iterbytestr to convert memoryview slice to bytestring before passing to itertools.takewhile
Closed	Kwan	D6102 py3: use fsencode for the vcr recording paths and strings for the custom_patches arguments
Closed	Kwan	D6044 phabricator: convert conduit response JSON unicode to bytes inside callconduit

Diff 14530

hgext/phabricator.py

	behaviour::			behaviour::

	[phabsend]			[phabsend]
	confirm = true			confirm = true

	phabsend will check obsstore and the above association to decide whether to			phabsend will check obsstore and the above association to decide whether to
	update an existing Differential Revision, or create a new one.			update an existing Differential Revision, or create a new one.
	"""			"""
				opts = pycompat.byteskwargs(opts)
	revs = list(revs) + opts.get(b'rev', [])			revs = list(revs) + opts.get(b'rev', [])
	revs = scmutil.revrange(repo, revs)			revs = scmutil.revrange(repo, revs)

	if not revs:			if not revs:
	raise error.Abort(_(b'phabsend requires at least one changeset'))			raise error.Abort(_(b'phabsend requires at least one changeset'))
	if opts.get(b'amend'):			if opts.get(b'amend'):
	cmdutil.checkunfinished(repo)			cmdutil.checkunfinished(repo)


	For example, ``:D6+8-(2+D4)`` selects a stack up to D6, plus D8 and exclude			For example, ``:D6+8-(2+D4)`` selects a stack up to D6, plus D8 and exclude
	D2 and D4. ``:D9 & needsreview`` selects "Needs Review" revisions in a			D2 and D4. ``:D9 & needsreview`` selects "Needs Review" revisions in a
	stack up to D9.			stack up to D9.

	If --stack is given, follow dependencies information and read all patches.			If --stack is given, follow dependencies information and read all patches.
	It is equivalent to the ``:`` operator.			It is equivalent to the ``:`` operator.
	"""			"""
				opts = pycompat.byteskwargs(opts)
	if opts.get(b'stack'):			if opts.get(b'stack'):
	spec = b':(%s)' % spec			spec = b':(%s)' % spec
	drevs = querydrev(repo, spec)			drevs = querydrev(repo, spec)
	readpatch(repo, drevs, ui.write)			readpatch(repo, drevs, ui.write)

	@vcrcommand(b'phabupdate',			@vcrcommand(b'phabupdate',
	[(b'', b'accept', False, _(b'accept revisions')),			[(b'', b'accept', False, _(b'accept revisions')),
	(b'', b'reject', False, _(b'reject revisions')),			(b'', b'reject', False, _(b'reject revisions')),
	(b'', b'abandon', False, _(b'abandon revisions')),			(b'', b'abandon', False, _(b'abandon revisions')),
	(b'', b'reclaim', False, _(b'reclaim revisions')),			(b'', b'reclaim', False, _(b'reclaim revisions')),
	(b'm', b'comment', b'', _(b'comment on the last revision')),			(b'm', b'comment', b'', _(b'comment on the last revision')),
	], _(b'DREVSPEC [OPTIONS]'),			], _(b'DREVSPEC [OPTIONS]'),
	helpcategory=command.CATEGORY_IMPORT_EXPORT)			helpcategory=command.CATEGORY_IMPORT_EXPORT)
	def phabupdate(ui, repo, spec, **opts):			def phabupdate(ui, repo, spec, **opts):
	"""update Differential Revision in batch			"""update Differential Revision in batch

	DREVSPEC selects revisions. See :hg:`help phabread` for its usage.			DREVSPEC selects revisions. See :hg:`help phabread` for its usage.
	"""			"""
				opts = pycompat.byteskwargs(opts)
	flags = [n for n in b'accept reject abandon reclaim'.split() if opts.get(n)]			flags = [n for n in b'accept reject abandon reclaim'.split() if opts.get(n)]
	if len(flags) > 1:			if len(flags) > 1:
	raise error.Abort(_(b'%s cannot be used together') % b', '.join(flags))			raise error.Abort(_(b'%s cannot be used together') % b', '.join(flags))

	actions = []			actions = []
	for f in flags:			for f in flags:
	actions.append({b'type': f, b'value': b'true'})			actions.append({b'type': f, b'value': b'true'})

This is an archive of the discontinued Mercurial Phabricator instance.

py3: use pycompat.byteskwargs on opts in phabricator.pyClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 14530

hgext/phabricator.py

py3: use pycompat.byteskwargs on opts in phabricator.py
ClosedPublic

Revision Contents
Changeset List