Patchwork D1104: peer: ensure command names are always ascii bytestrs

login
register
mail settings
Submitter phabricator
Date Oct. 16, 2017, 9:17 a.m.
Message ID <943b21e727209193d7b3061282076090@localhost.localdomain>
Download mbox | patch
Permalink /patch/24971/
State Not Applicable
Headers show

Comments

phabricator - Oct. 16, 2017, 9:17 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG115efdd97088: peer: ensure command names are always ascii bytestrs (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1104?vs=2796&id=2806

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

AFFECTED FILES
  mercurial/peer.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/peer.py b/mercurial/peer.py
--- a/mercurial/peer.py
+++ b/mercurial/peer.py
@@ -10,6 +10,7 @@ 
 
 from . import (
     error,
+    pycompat,
     util,
 )
 
@@ -92,7 +93,8 @@ 
         if not encresref:
             return encargsorres # a local result in this case
         self = args[0]
-        encresref.set(self._submitone(f.__name__, encargsorres))
+        cmd = pycompat.bytesurl(f.__name__)  # ensure cmd is ascii bytestr
+        encresref.set(self._submitone(cmd, encargsorres))
         return next(batchable)
     setattr(plain, 'batchable', f)
     return plain