# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 2019-11-02 20:04:47
# Node ID e6ce1599af74467a38065c9640d16be1a1ff3309
# Parent  51316de92ad064bd63fe2af3128ae39a1fb4fa90

fsmonitor: fix str/bytes mismatch when accessing watchman version

There were 2 bugs here. First, keys in the tuple are always
str. Second, we needed to normalize the value to bytes to
prevent a str/bytes mismatch on Python 3.

With this commit, `hg debuginstall` with fsmonitor enabled now
works on Python 3.

Differential Revision: https://phab.mercurial-scm.org/D7205

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 @@ def debuginstall(ui, fm):
         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)