mercurial-scm/hg: mercurial/exchange.py comparison

comparison mercurial/exchange.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	2c70dd03b743
children	9c1f4e2f1fc4

comparison

equal deleted inserted replaced

-:47fac1692ede
+:9f70512ae2cf
 ]
 user_excludes = [
 b'path:.' if p == b'*' else b'path:' + p for p in user_excludes
 ]
-req_includes = set(kwargs.get(r'includepats', []))
+req_includes = set(kwargs.get('includepats', []))
-req_excludes = set(kwargs.get(r'excludepats', []))
+req_excludes = set(kwargs.get('excludepats', []))
 req_includes, req_excludes, invalid_includes = narrowspec.restrictpatterns(
 req_includes, req_excludes, user_includes, user_excludes
 )
 )
 )
 new_args = {}
 new_args.update(kwargs)
-new_args[r'narrow'] = True
+new_args['narrow'] = True
-new_args[r'narrow_acl'] = True
+new_args['narrow_acl'] = True
-new_args[r'includepats'] = req_includes
+new_args['includepats'] = req_includes
 if req_excludes:
-new_args[r'excludepats'] = req_excludes
+new_args['excludepats'] = req_excludes
 return new_args
 def _computeellipsis(repo, common, heads, known, match, depth=None):
 heads=None,
 common=None,
 **kwargs
 ):
 """add a changegroup part to the requested bundle"""
-if not kwargs.get(r'cg', True):
+if not kwargs.get('cg', True):
 return
 version = b'01'
 cgversions = b2caps.get(b'changegroup')
 if cgversions:  # 3.1 and 3.2 ship with an empty value
 outgoing = _computeoutgoing(repo, heads, common)
 if not outgoing.missing:
 return
-if kwargs.get(r'narrow', False):
+if kwargs.get('narrow', False):
-include = sorted(filter(bool, kwargs.get(r'includepats', [])))
+include = sorted(filter(bool, kwargs.get('includepats', [])))
-exclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))
+exclude = sorted(filter(bool, kwargs.get('excludepats', [])))
 matcher = narrowspec.match(repo.root, include=include, exclude=exclude)
 else:
 matcher = None
 cgstream = changegroup.makestream(
 if b'exp-sidedata-flag' in repo.requirements:
 part.addparam(b'exp-sidedata', b'1')
 if (
-kwargs.get(r'narrow', False)
+kwargs.get('narrow', False)
-and kwargs.get(r'narrow_acl', False)
+and kwargs.get('narrow_acl', False)
 and (include or exclude)
 ):
 # this is mandatory because otherwise ACL clients won't work
 narrowspecpart = bundler.newpart(b'Narrow:responsespec')
 narrowspecpart.data = b'%s\0%s' % (
 @getbundle2partsgenerator(b'bookmarks')
 def _getbundlebookmarkpart(
 bundler, repo, source, bundlecaps=None, b2caps=None, **kwargs
 ):
 """add a bookmark part to the requested bundle"""
-if not kwargs.get(r'bookmarks', False):
+if not kwargs.get('bookmarks', False):
 return
 if b'bookmarks' not in b2caps:
 raise error.Abort(_(b'no common bookmarks exchange method'))
 books = bookmod.listbinbookmarks(repo)
 data = bookmod.binaryencode(books)
 @getbundle2partsgenerator(b'listkeys')
 def _getbundlelistkeysparts(
 bundler, repo, source, bundlecaps=None, b2caps=None, **kwargs
 ):
 """add parts containing listkeys namespaces to the requested bundle"""
-listkeys = kwargs.get(r'listkeys', ())
+listkeys = kwargs.get('listkeys', ())
 for namespace in listkeys:
 part = bundler.newpart(b'listkeys')
 part.addparam(b'namespace', namespace)
 keys = repo.listkeys(namespace).items()
 part.data = pushkey.encodekeys(keys)
 @getbundle2partsgenerator(b'obsmarkers')
 def _getbundleobsmarkerpart(
 bundler, repo, source, bundlecaps=None, b2caps=None, heads=None, **kwargs
 ):
 """add an obsolescence markers part to the requested bundle"""
-if kwargs.get(r'obsmarkers', False):
+if kwargs.get('obsmarkers', False):
 if heads is None:
 heads = repo.heads()
 subset = [c.node() for c in repo.set(b'::%ln', heads)]
 markers = repo.obsstore.relevantmarkers(subset)
 markers = _sortedmarkers(markers)
 @getbundle2partsgenerator(b'phases')
 def _getbundlephasespart(
 bundler, repo, source, bundlecaps=None, b2caps=None, heads=None, **kwargs
 ):
 """add phase heads part to the requested bundle"""
-if kwargs.get(r'phases', False):
+if kwargs.get('phases', False):
 if not b'heads' in b2caps.get(b'phases'):
 raise error.Abort(_(b'no common phases exchange method'))
 if heads is None:
 heads = repo.heads()
 filenodes raw values.
 """
 # Don't send unless:
 # - changeset are being exchanged,
 # - the client supports it.
-if not (kwargs.get(r'cg', True) and b'hgtagsfnodes' in b2caps):
+if not (kwargs.get('cg', True) and b'hgtagsfnodes' in b2caps):
 return
 outgoing = _computeoutgoing(repo, heads, common)
 bundle2.addparttagsfnodescache(repo, bundler, outgoing)
 # Don't send unless:
 # - changeset are being exchanged,
 # - the client supports it.
 # - narrow bundle isn't in play (not currently compatible).
 if (
-not kwargs.get(r'cg', True)
+not kwargs.get('cg', True)
 or b'rev-branch-cache' not in b2caps
-or kwargs.get(r'narrow', False)
+or kwargs.get('narrow', False)
 or repo.ui.has_section(_NARROWACL_SECTION)
 ):
 return
 outgoing = _computeoutgoing(repo, heads, common)

Mercurial > public > mercurial-scm > hg

comparison mercurial/exchange.py @ 43506:9f70512ae2cf