Patchwork D7205: fsmonitor: fix str/bytes mismatch when accessing watchman version

login
register
mail settings
Submitter phabricator
Date Nov. 4, 2019, 4:27 p.m.
Message ID <9c5abba33990b3f887a0813fcec9da4c@localhost.localdomain>
Download mbox | patch
Permalink /patch/42713/
State Not Applicable
Headers show

Comments

phabricator - Nov. 4, 2019, 4:27 p.m.
Closed by commit rHGe6ce1599af74: fsmonitor: fix str/bytes mismatch when accessing watchman version (authored by indygreg).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7205?vs=17503&id=17521

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7205/new/

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

AFFECTED FILES
  hgext/fsmonitor/__init__.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py
--- a/hgext/fsmonitor/__init__.py
+++ b/hgext/fsmonitor/__init__.py
@@ -190,7 +190,7 @@ 
         fm.write(
             b"fsmonitor-watchman-version",
             _(b" watchman binary version %s\n"),
-            v[b"version"],
+            pycompat.bytestr(v["version"]),
         )
     except watchmanclient.Unavailable as e:
         err = str(e)