# HG changeset patch
# User RhodeCode Admin <admin@rhodecode.com>
# Date 2023-07-26 15:14:54
# Node ID 1721e701b504aad2287be1cbc1e58e51b1208c61
# Parent  7b7ca85641d35cd8061a59bb193bd5e6222ef487

caches: ensure we return serializable results from vcscalls

diff --git a/vcsserver/remote/git.py b/vcsserver/remote/git.py
--- a/vcsserver/remote/git.py
+++ b/vcsserver/remote/git.py
@@ -447,9 +447,9 @@ class GitRemote(RemoteBase):
                     result[attr] = method(wire, _commit_id, _path)
                 except KeyError as e:
                     raise exceptions.VcsException(e)(f'Unknown bulk attribute: "{attr}"')
-            return BinaryEnvelope(result)
+            return result
 
-        return _bulk_file_request(repo_id, commit_id, path, sorted(pre_load))
+        return BinaryEnvelope(_bulk_file_request(repo_id, commit_id, path, sorted(pre_load)))
 
     def _build_opener(self, url: str):
         handlers = []
diff --git a/vcsserver/remote/hg.py b/vcsserver/remote/hg.py
--- a/vcsserver/remote/hg.py
+++ b/vcsserver/remote/hg.py
@@ -583,9 +583,9 @@ class HgRemote(RemoteBase):
                     result[attr] = method(wire, _commit_id, _path)
                 except KeyError as e:
                     raise exceptions.VcsException(e)(f'Unknown bulk attribute: "{attr}"')
-            return BinaryEnvelope(result)
+            return result
 
-        return _bulk_file_request(repo_id, commit_id, path, sorted(pre_load))
+        return BinaryEnvelope(_bulk_file_request(repo_id, commit_id, path, sorted(pre_load)))
 
     @reraise_safe_exceptions
     def fctx_annotate(self, wire, revision, path):
diff --git a/vcsserver/remote/svn.py b/vcsserver/remote/svn.py
--- a/vcsserver/remote/svn.py
+++ b/vcsserver/remote/svn.py
@@ -139,9 +139,9 @@ class SvnRemote(RemoteBase):
                     result[attr] = method(wire, _commit_id, _path)
                 except KeyError as e:
                     raise exceptions.VcsException(e)(f'Unknown bulk attribute: "{attr}"')
-            return BinaryEnvelope(result)
+            return result
 
-        return _bulk_file_request(repo_id, commit_id, path, sorted(pre_load))
+        return BinaryEnvelope(_bulk_file_request(repo_id, commit_id, path, sorted(pre_load)))
 
     @reraise_safe_exceptions
     def discover_svn_version(self):