This is an archive of the discontinued Mercurial Phabricator instance.

if invalid_includes:
    raise error.Abort(
_(b"The following includes are not accessible for {}: {}").format(

username, invalid_includes

)

+ _(b"The following includes are not accessible for %s: %s")
+ % (username, invalid_includes)

Perhaps, invalid_includes is a list, and b'%s' % a_list is invalid on py3.

mharbison72 added a commit: rHG27c6d6f53d46: exchange: eliminate some bytes.format() calls.Dec 3 2019, 10:59 AM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/exchange.py (10 lines)

Commit	Parents	Author	Summary	Date
22955e856fd3	25fe3109cfb8	Matt Harbison		Nov 22 2019, 11:58 PM

Status	Author	Revision
Closed	mharbison72	D7512 exchange: guard against method invocation on `b2caps=None` args
Closed	mharbison72	D7511 exchange: eliminate some bytes.format() calls
Closed	mharbison72	D7510 windows: suppress pytype warnings for Windows imports and functions

Diff 18336

mercurial/exchange.py

	)			)
	user_excludes = ui.configlist(			user_excludes = ui.configlist(
	_NARROWACL_SECTION,			_NARROWACL_SECTION,
	username + b'.excludes',			username + b'.excludes',
	ui.configlist(_NARROWACL_SECTION, b'default.excludes'),			ui.configlist(_NARROWACL_SECTION, b'default.excludes'),
	)			)
	if not user_includes:			if not user_includes:
	raise error.Abort(			raise error.Abort(
	_(b"{} configuration for user {} is empty").format(			_(b"%s configuration for user %s is empty")
	_NARROWACL_SECTION, username			% (_NARROWACL_SECTION, username)
	)
	)			)

	user_includes = [			user_includes = [
	b'path:.' if p == b'*' else b'path:' + p for p in user_includes			b'path:.' if p == b'*' else b'path:' + p for p in user_includes
	]			]
	user_excludes = [			user_excludes = [
	b'path:.' if p == b'*' else b'path:' + p for p in user_excludes			b'path:.' if p == b'*' else b'path:' + p for p in user_excludes
	]			]

	req_includes = set(kwargs.get('includepats', []))			req_includes = set(kwargs.get('includepats', []))
	req_excludes = set(kwargs.get('excludepats', []))			req_excludes = set(kwargs.get('excludepats', []))

	req_includes, req_excludes, invalid_includes = narrowspec.restrictpatterns(			req_includes, req_excludes, invalid_includes = narrowspec.restrictpatterns(
	req_includes, req_excludes, user_includes, user_excludes			req_includes, req_excludes, user_includes, user_excludes
	)			)

	if invalid_includes:			if invalid_includes:
	raise error.Abort(			raise error.Abort(
	_(b"The following includes are not accessible for {}: {}").format(			_(b"The following includes are not accessible for %s: %s")
	username, invalid_includes			% (username, invalid_includes)
	)
	)			)

	new_args = {}			new_args = {}
	new_args.update(kwargs)			new_args.update(kwargs)
	new_args['narrow'] = True			new_args['narrow'] = True
	new_args['narrow_acl'] = True			new_args['narrow_acl'] = True
	new_args['includepats'] = req_includes			new_args['includepats'] = req_includes
	if req_excludes:			if req_excludes:

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	18336		Nov 23 2019, 12:15 AM	★	★
Diff 2	18378	rHG76d4bf0a652b40ffe95f4db62da483d3386226bc	Nov 22 2019, 11:58 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

exchange: eliminate some bytes.format() callsClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 18336

mercurial/exchange.py

exchange: eliminate some bytes.format() calls
ClosedPublic

Revision Contents
Changeset List