Patchwork D2366: narrowwirepeer: add some strkwargs to fix a crash on py3

login
register
mail settings
Submitter phabricator
Date Feb. 22, 2018, 3:24 a.m.
Message ID <3c451feecaad54f1fe09a9c188200643@localhost.localdomain>
Download mbox | patch
Permalink /patch/28229/
State Not Applicable
Headers show

Comments

phabricator - Feb. 22, 2018, 3:24 a.m.
durin42 updated this revision to Diff 5979.
durin42 marked 2 inline comments as done.
durin42 edited the summary of this revision.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2366?vs=5946&id=5979

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

AFFECTED FILES
  hgext/narrow/narrowwirepeer.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/narrow/narrowwirepeer.py b/hgext/narrow/narrowwirepeer.py
--- a/hgext/narrow/narrowwirepeer.py
+++ b/hgext/narrow/narrowwirepeer.py
@@ -45,8 +45,8 @@ 
                 # TODO: don't blindly add include/exclude wireproto
                 # arguments to unbundle.
                 include, exclude = repo.narrowpats
-                kwargs["includepats"] = ','.join(include)
-                kwargs["excludepats"] = ','.join(exclude)
+                kwargs[r"includepats"] = ','.join(include)
+                kwargs[r"excludepats"] = ','.join(exclude)
             return orig(cmd, *args, **kwargs)
         extensions.wrapfunction(peer, '_calltwowaystream', wrapped)
     hg.wirepeersetupfuncs.append(wirereposetup)