##// END OF EJS Templates
narrowbundle2: more kwargs native string fixes...
Augie Fackler -
r36377:adce75cd default
parent child Browse files
Show More
@@ -259,7 +259,7 b' def getbundlechangegrouppart_narrow(bund'
259
259
260 return
260 return
261
261
262 depth = kwargs.get('depth', None)
262 depth = kwargs.get(r'depth', None)
263 if depth is not None:
263 if depth is not None:
264 depth = int(depth)
264 depth = int(depth)
265 if depth < 1:
265 if depth < 1:
@@ -267,9 +267,9 b' def getbundlechangegrouppart_narrow(bund'
267
267
268 heads = set(heads or repo.heads())
268 heads = set(heads or repo.heads())
269 common = set(common or [nullid])
269 common = set(common or [nullid])
270 oldinclude = sorted(filter(bool, kwargs.get('oldincludepats', [])))
270 oldinclude = sorted(filter(bool, kwargs.get(r'oldincludepats', [])))
271 oldexclude = sorted(filter(bool, kwargs.get('oldexcludepats', [])))
271 oldexclude = sorted(filter(bool, kwargs.get(r'oldexcludepats', [])))
272 known = {bin(n) for n in kwargs.get('known', [])}
272 known = {bin(n) for n in kwargs.get(r'known', [])}
273 if known and (oldinclude != include or oldexclude != exclude):
273 if known and (oldinclude != include or oldexclude != exclude):
274 # Steps:
274 # Steps:
275 # 1. Send kill for "$known & ::common"
275 # 1. Send kill for "$known & ::common"
@@ -343,8 +343,8 b' def applyacl_narrow(repo, kwargs):'
343 user_excludes = [
343 user_excludes = [
344 'path:.' if p == '*' else 'path:' + p for p in user_excludes]
344 'path:.' if p == '*' else 'path:' + p for p in user_excludes]
345
345
346 req_includes = set(kwargs.get('includepats', []))
346 req_includes = set(kwargs.get(r'includepats', []))
347 req_excludes = set(kwargs.get('excludepats', []))
347 req_excludes = set(kwargs.get(r'excludepats', []))
348
348
349 req_includes, req_excludes, invalid_includes = narrowspec.restrictpatterns(
349 req_includes, req_excludes, invalid_includes = narrowspec.restrictpatterns(
350 req_includes, req_excludes, user_includes, user_excludes)
350 req_includes, req_excludes, user_includes, user_excludes)
General Comments 0
You need to be logged in to leave comments. Login now