This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7511

exchange: eliminate some bytes.format() calls
ClosedPublic

Authored by mharbison72 on Nov 23 2019, 12:15 AM.

Details

Reviewers
dlax
indygreg
Group Reviewers
hg-reviewers
Commits
rHG27c6d6f53d46: exchange: eliminate some bytes.format() calls
rHG76d4bf0a652b: exchange: eliminate some bytes.format() calls

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Nov 23 2019, 12:15 AM
dlax accepted this revision.Nov 23 2019, 3:40 AM
indygreg accepted this revision.Nov 23 2019, 7:59 PM
This revision is now accepted and ready to land.Nov 23 2019, 7:59 PM
mharbison72 added a commit: rHG76d4bf0a652b: exchange: eliminate some bytes.format() calls.Nov 23 2019, 8:01 PM
Closed by commit rHG76d4bf0a652b: exchange: eliminate some bytes.format() calls (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Nov 24 2019, 12:16 AM
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.

Revision Contents
Changeset List

PathPackages
Mmercurial/exchange.py (10 lines)

Diff 18378

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: