Mercurial > hg
comparison hgext/acl.py @ 43506:9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
This is the promised second step on single-quoted strings. These had
existed because our source transformer didn't turn r'' into b'', so we
had tagged some strings as r-strings to get "native" strings on both
Pythons. Now that the transformer is gone, we can dispense with this
nonsense.
Methodology:
I ran
hg locate 'set:added() or modified() or clean()' | egrep '.*\.py$' | xargs egrep --color=never -n -- \[\^b\]\[\^a-z\]r\'\[\^\'\\\\\]\*\'\[\^\'\
in an emacs grep-mode buffer, and then used a keyboard macro to
iterate over the results and remove the r prefix as needed.
# skip-blame removing unneeded r prefixes left over from Python 3 migration.
Differential Revision: https://phab.mercurial-scm.org/D7306
author | Augie Fackler <augie@google.com> |
---|---|
date | Fri, 08 Nov 2019 11:19:20 -0800 |
parents | 8ff1ecfadcd1 |
children | 89a2afe31e82 |
comparison
equal
deleted
inserted
replaced
43505:47fac1692ede | 43506:9f70512ae2cf |
---|---|
367 ): | 367 ): |
368 ui.debug(b'acl: changes have source "%s" - skipping\n' % source) | 368 ui.debug(b'acl: changes have source "%s" - skipping\n' % source) |
369 return | 369 return |
370 | 370 |
371 user = None | 371 user = None |
372 if source == b'serve' and r'url' in kwargs: | 372 if source == b'serve' and 'url' in kwargs: |
373 url = kwargs[r'url'].split(b':') | 373 url = kwargs['url'].split(b':') |
374 if url[0] == b'remote' and url[1].startswith(b'http'): | 374 if url[0] == b'remote' and url[1].startswith(b'http'): |
375 user = urlreq.unquote(url[3]) | 375 user = urlreq.unquote(url[3]) |
376 | 376 |
377 if user is None: | 377 if user is None: |
378 user = procutil.getuser() | 378 user = procutil.getuser() |
384 else: | 384 else: |
385 _txnhook(ui, repo, hooktype, node, source, user, **kwargs) | 385 _txnhook(ui, repo, hooktype, node, source, user, **kwargs) |
386 | 386 |
387 | 387 |
388 def _pkhook(ui, repo, hooktype, node, source, user, **kwargs): | 388 def _pkhook(ui, repo, hooktype, node, source, user, **kwargs): |
389 if kwargs[r'namespace'] == b'bookmarks': | 389 if kwargs['namespace'] == b'bookmarks': |
390 bookmark = kwargs[r'key'] | 390 bookmark = kwargs['key'] |
391 ctx = kwargs[r'new'] | 391 ctx = kwargs['new'] |
392 allowbookmarks = buildmatch(ui, None, user, b'acl.allow.bookmarks') | 392 allowbookmarks = buildmatch(ui, None, user, b'acl.allow.bookmarks') |
393 denybookmarks = buildmatch(ui, None, user, b'acl.deny.bookmarks') | 393 denybookmarks = buildmatch(ui, None, user, b'acl.deny.bookmarks') |
394 | 394 |
395 if denybookmarks and denybookmarks(bookmark): | 395 if denybookmarks and denybookmarks(bookmark): |
396 raise error.Abort( | 396 raise error.Abort( |