caches: ensure we return serializable results from vcscalls

vcsserver/remote/git.py

@@ -447,9 +447,9 b' 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 = []

vcsserver/remote/hg.py

@@ -583,9 +583,9 b' 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):

vcsserver/remote/svn.py

@@ -139,9 +139,9 b' 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):