From 66fd50346c4cf0e8e7ac52c1a0be5013a48dfcb6 Mon Sep 17 00:00:00 2001
From: Durham Goode <durham@fb.com>
Date: Mon, 17 Feb 2020 14:47:28 -0800
Subject: [PATCH] py3: add pycompat buffer alias

Summary: buffer in Python 2 became memoryview in Python 3.

Reviewed By: quark-zju

Differential Revision: D19717251

fbshipit-source-id: f678abfed7e2ec94053329b13015bff3c31eb319
---
 eden/scm/edenscm/hgext/remotefilelog/shallowbundle.py | 4 ++--
 eden/scm/edenscm/mercurial/pycompat.py                | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eden/scm/edenscm/hgext/remotefilelog/shallowbundle.py b/eden/scm/edenscm/hgext/remotefilelog/shallowbundle.py
index 3e42673216..c0da12c25c 100644
--- a/eden/scm/edenscm/hgext/remotefilelog/shallowbundle.py
+++ b/eden/scm/edenscm/hgext/remotefilelog/shallowbundle.py
@@ -327,7 +327,7 @@ class shallowcg1packer(changegroup.cg1packer):
         return results
 
     def nodechunk(self, revlog, node, prevnode, linknode):
-        prefix = ""
+        prefix = b""
         if prevnode is not nullid and not revlog.candelta(prevnode, node):
             basenode = nullid
         else:
@@ -525,7 +525,7 @@ def addchangegroupfiles(orig, repo, source, revmap, trp, expectedfiles, *args):
                     raise error.Abort("unexpected deltabase")
                 base = reconstruct(f, deltabase)
             rawtext = mdiff.patch(base, delta)
-            if isinstance(rawtext, buffer):  # noqa
+            if isinstance(rawtext, pycompat.buffer):  # noqa
                 rawtext = bytes(rawtext)
             return rawtext
 
diff --git a/eden/scm/edenscm/mercurial/pycompat.py b/eden/scm/edenscm/mercurial/pycompat.py
index 715d1f53d5..eb517d7dfc 100644
--- a/eden/scm/edenscm/mercurial/pycompat.py
+++ b/eden/scm/edenscm/mercurial/pycompat.py
@@ -96,6 +96,7 @@ if sys.version_info[0] >= 3:
 
     bytechr = chr
     bytestr = str
+    buffer = memoryview
 
     def raisewithtb(exc, tb):
         """Raise exception with the given traceback"""
@@ -143,6 +144,7 @@ else:
 
     bytechr = chr
     bytestr = str
+    buffer = buffer
     range = xrange  # noqa: F821
     unicode = unicode