D7208: fsmonitor: normalize hostname to bytes

Submitter	phabricator
Date	Nov. 2, 2019, 10:04 p.m.
Message ID	<differential-rev-PHID-DREV-55ik346mlxc6kzu3f4ki-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/42691/
State	Superseded
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Sat, 2 Nov 2019 22:04:26 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "indygreg (Gregory Szorc)" <phabricator@mercurial-scm.org> Subject: D7208: fsmonitor: normalize hostname to bytes Message-ID: <differential-rev-PHID-DREV-55ik346mlxc6kzu3f4ki-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-55ik346mlxc6kzu3f4ki Thread-Index: MzBiNmUyMTIwYTkzN2QwMGZiMzhlN2FiYzQx MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "indygreg \(Gregory Szorc\)" <phabricator+D7208+public+799762a13d64d7b4@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - Nov. 2, 2019, 10:04 p.m.

indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Without this, we get a str/bytes mismatching when using %
  formatting a few lines below.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

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

AFFECTED FILES
  hgext/fsmonitor/state.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/fsmonitor/state.py b/hgext/fsmonitor/state.py
--- a/hgext/fsmonitor/state.py
+++ b/hgext/fsmonitor/state.py
@@ -14,6 +14,7 @@ 
 
 from mercurial.i18n import _
 from mercurial import (
+    encoding,
     pathutil,
     util,
 )
@@ -81,7 +82,7 @@ 
                 self.invalidate()
                 return None, None, None
             diskhostname = state[0]
-            hostname = socket.gethostname()
+            hostname = encoding.strtolocal(socket.gethostname())
             if diskhostname != hostname:
                 # file got moved to a different host
                 self._ui.log(
@@ -127,7 +128,7 @@ 
 
         with file:
             file.write(struct.pack(_versionformat, _version))
-            file.write(socket.gethostname() + b'\0')
+            file.write(encoding.strtolocal(socket.gethostname()) + b'\0')
             file.write(clock + b'\0')
             file.write(ignorehash + b'\0')
             if notefiles:

Patchwork D7208: fsmonitor: normalize hostname to bytes

Comments

Patch