Patchwork D2389: narrowbundle2: more kwargs native string fixes

login
register
mail settings
Submitter phabricator
Date Feb. 22, 2018, 6:08 a.m.
Message ID <differential-rev-PHID-DREV-jj4sbiair4xczbx44uf5-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/28241/
State Superseded
Headers show

Comments

phabricator - Feb. 22, 2018, 6:08 a.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This gets test-narrow.t to *almost* pass. Something appears to be
  borked in producing bundles, but only some of the time? I'm lost, but
  this change is at least a clear improvement.
  
  1. skip-blame just more r prefixes on strings

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2389

AFFECTED FILES
  hgext/narrow/narrowbundle2.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/narrow/narrowbundle2.py b/hgext/narrow/narrowbundle2.py
--- a/hgext/narrow/narrowbundle2.py
+++ b/hgext/narrow/narrowbundle2.py
@@ -259,17 +259,17 @@ 
 
         return
 
-    depth = kwargs.get('depth', None)
+    depth = kwargs.get(r'depth', None)
     if depth is not None:
         depth = int(depth)
         if depth < 1:
             raise error.Abort(_('depth must be positive, got %d') % depth)
 
     heads = set(heads or repo.heads())
     common = set(common or [nullid])
-    oldinclude = sorted(filter(bool, kwargs.get('oldincludepats', [])))
-    oldexclude = sorted(filter(bool, kwargs.get('oldexcludepats', [])))
-    known = {bin(n) for n in kwargs.get('known', [])}
+    oldinclude = sorted(filter(bool, kwargs.get(r'oldincludepats', [])))
+    oldexclude = sorted(filter(bool, kwargs.get(r'oldexcludepats', [])))
+    known = {bin(n) for n in kwargs.get(r'known', [])}
     if known and (oldinclude != include or oldexclude != exclude):
         # Steps:
         # 1. Send kill for "$known & ::common"
@@ -343,8 +343,8 @@ 
     user_excludes = [
         'path:.' if p == '*' else 'path:' + p for p in user_excludes]
 
-    req_includes = set(kwargs.get('includepats', []))
-    req_excludes = set(kwargs.get('excludepats', []))
+    req_includes = set(kwargs.get(r'includepats', []))
+    req_excludes = set(kwargs.get(r'excludepats', []))
 
     req_includes, req_excludes, invalid_includes = narrowspec.restrictpatterns(
         req_includes, req_excludes, user_includes, user_excludes)