py3: fix eden lfs fetching

Summary: The tests now pass

Reviewed By: xavierd

Differential Revision: D22561933

fbshipit-source-id: 7f130391de845207589b0abe52481d03915ce18f
This commit is contained in:
Durham Goode 2020-07-15 22:14:41 -07:00 committed by Facebook GitHub Bot
parent 2a07de29df
commit 2eae6130fb
3 changed files with 4 additions and 3 deletions

View File

@ -17,6 +17,7 @@ from edenscm.mercurial import (
pathutil,
perftrace,
progress,
pycompat,
url as urlmod,
util,
vfs as vfsmod,
@ -116,7 +117,9 @@ class _gitlfsremote(object):
"""
self.ui.log("lfs_url", lfs_url=self.baseurl)
objects = [{"oid": p.oid(), "size": p.size()} for p in pointers]
requestdata = json.dumps({"objects": objects, "operation": action})
requestdata = pycompat.encodeutf8(
json.dumps({"objects": objects, "operation": action})
)
batchreq = util.urlreq.request(
"%s/objects/batch" % self.baseurl, data=requestdata
)

View File

@ -1,4 +1,3 @@
#require py2
XXX: This test is currently broken if lfs-test-server is installed.
#require false lfs-test-server

View File

@ -1,4 +1,3 @@
#require py2
$ disable treemanifest
# Initial setup