From d6d60bda6abbbe106a62b708ddec6343b1f22708 Mon Sep 17 00:00:00 2001
From: Xavier Deguillard <xavierd@fb.com>
Date: Thu, 30 Jan 2020 18:39:19 -0800
Subject: [PATCH] clone: make the samplehgrcs strings

Summary: These aren't bytes, they are strings.

Reviewed By: quark-zju

Differential Revision: D19656112

fbshipit-source-id: fcd505e3b4e522154358c80305e39ebca5936395
---
 eden/scm/edenscm/mercurial/commands/__init__.py | 2 +-
 eden/scm/edenscm/mercurial/hg.py                | 3 ++-
 eden/scm/edenscm/mercurial/ui.py                | 8 ++++----
 eden/scm/edenscm/mercurial/util.py              | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/eden/scm/edenscm/mercurial/commands/__init__.py b/eden/scm/edenscm/mercurial/commands/__init__.py
index bf083eb086..c2a368be0a 100644
--- a/eden/scm/edenscm/mercurial/commands/__init__.py
+++ b/eden/scm/edenscm/mercurial/commands/__init__.py
@@ -1843,7 +1843,7 @@ def config(ui, repo, *values, **opts):
 
             f = paths[0]
             fp = open(f, "wb")
-            fp.write(util.tonativeeol(samplehgrc))
+            fp.write(pycompat.encodeutf8(util.tonativeeol(samplehgrc)))
             fp.close()
 
         editor = ui.geteditor()
diff --git a/eden/scm/edenscm/mercurial/hg.py b/eden/scm/edenscm/mercurial/hg.py
index 1a1b0a77ba..3043f6aa2d 100644
--- a/eden/scm/edenscm/mercurial/hg.py
+++ b/eden/scm/edenscm/mercurial/hg.py
@@ -37,6 +37,7 @@ from . import (
     perftrace,
     phases,
     progress,
+    pycompat,
     repoview,
     scmutil,
     sshpeer,
@@ -760,7 +761,7 @@ def clone(
                 u = util.url(abspath)
                 u.passwd = None
                 defaulturl = str(u)
-                fp.write(util.tonativeeol(template % defaulturl))
+                fp.write(pycompat.encodeutf8(util.tonativeeol(template % defaulturl)))
                 fp.close()
 
                 destrepo.ui.setconfig("paths", "default", defaulturl, "clone")
diff --git a/eden/scm/edenscm/mercurial/ui.py b/eden/scm/edenscm/mercurial/ui.py
index 2494e8d18c..e26caff1c3 100644
--- a/eden/scm/edenscm/mercurial/ui.py
+++ b/eden/scm/edenscm/mercurial/ui.py
@@ -54,7 +54,7 @@ from .pycompat import decodeutf8, encodeutf8
 urlreq = util.urlreq
 
 samplehgrcs = {
-    "user": b"""# example user config (see 'hg help config' for more info)
+    "user": """# example user config (see 'hg help config' for more info)
 [ui]
 # name and email, e.g.
 # username = Jane Doe <jdoe@example.com>
@@ -74,7 +74,7 @@ username =
 #
 # churn =
 """,
-    "cloned": b"""# example repository config (see 'hg help config' for more info)
+    "cloned": """# example repository config (see 'hg help config' for more info)
 [paths]
 default = %s
 
@@ -89,7 +89,7 @@ default = %s
 # name and email (local to this repository, optional), e.g.
 # username = Jane Doe <jdoe@example.com>
 """,
-    "local": b"""# example repository config (see 'hg help config' for more info)
+    "local": """# example repository config (see 'hg help config' for more info)
 [paths]
 # path aliases to other clones of this repo in URLs or filesystem paths
 # (see 'hg help config.paths' for more info)
@@ -103,7 +103,7 @@ default = %s
 # name and email (local to this repository, optional), e.g.
 # username = Jane Doe <jdoe@example.com>
 """,
-    "global": b"""# example system-wide hg config (see 'hg help config' for more info)
+    "global": """# example system-wide hg config (see 'hg help config' for more info)
 
 [ui]
 # uncomment to disable color in command output
diff --git a/eden/scm/edenscm/mercurial/util.py b/eden/scm/edenscm/mercurial/util.py
index f04069301e..c72f527a51 100644
--- a/eden/scm/edenscm/mercurial/util.py
+++ b/eden/scm/edenscm/mercurial/util.py
@@ -2400,7 +2400,7 @@ bytecount = unitcountfn(
 # Matches a single EOL which can either be a CRLF where repeated CR
 # are removed or a LF. We do not care about old Macintosh files, so a
 # stray CR is an error.
-_eolre = remod.compile(br"\r*\n")
+_eolre = remod.compile(r"\r*\n")
 
 
 def tolf(s):