From patchwork Tue Dec 10 23:49:41 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D7598: py3: fix a bytes vs str issue in remotefilelog extension
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 43695
Message-Id: <differential-rev-PHID-DREV-q26djmjuhbntjhpjmykj-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Tue, 10 Dec 2019 23:49:41 +0000

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

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  hgext/remotefilelog/fileserverclient.py

CHANGE DETAILS




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

diff --git a/hgext/remotefilelog/fileserverclient.py b/hgext/remotefilelog/fileserverclient.py
--- a/hgext/remotefilelog/fileserverclient.py
+++ b/hgext/remotefilelog/fileserverclient.py
@@ -663,5 +663,5 @@
         self.ui.log(
             b'remotefilelog',
             b'excess remotefilelog fetching:\n%s\n',
-            b''.join(traceback.format_stack()),
+            b''.join(pycompat.sysbytes(traceback.format_stack())),
         )