Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
---
odb-helper.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 73 insertions(+), 3 deletions(-)
diff --git a/odb-helper.c b/odb-helper.c
index b2d86a7928..e21113c0b8 100644
--- a/odb-helper.c
+++ b/odb-helper.c
@@ -383,6 +383,65 @@ static int read_object_process(struct odb_helper *o, const unsigned char *sha1,
return err;
}
+static int write_object_process(struct odb_helper *o,
+ const void *buf, size_t len,
+ const char *type, unsigned char *sha1)
+{
+ int err;
+ struct read_object_process *entry;
+ struct child_process *process;
+ struct strbuf status = STRBUF_INIT;
+ const char *cmd = o->cmd;
+ uint64_t start;
+
+ start = getnanotime();
+
+ entry = launch_read_object_process(cmd);
+ process = &entry->subprocess.process;
+ o->supported_capabilities = entry->supported_capabilities;
+
+ if (!(ODB_HELPER_CAP_PUT & entry->supported_capabilities))
+ return -1;
+
+ sigchain_push(SIGPIPE, SIG_IGN);
+
+ err = packet_write_fmt_gently(process->in, "command=put\n");
+ if (err)
+ goto done;
+
+ err = packet_write_fmt_gently(process->in, "sha1=%s\n", sha1_to_hex(sha1));
+ if (err)
+ goto done;
+
+ err = packet_write_fmt_gently(process->in, "size=%"PRIuMAX"\n", len);
+ if (err)
+ goto done;
+
+ err = packet_write_fmt_gently(process->in, "kind=blob\n");
+ if (err)
+ goto done;
+
+ err = packet_flush_gently(process->in);
+ if (err)
+ goto done;
+
+ err = write_packetized_from_buf(buf, len, process->in);
+ if (err)
+ goto done;
+
+ subprocess_read_status(process->out, &status);
+ err = strcmp(status.buf, "success");
+
+done:
+ sigchain_pop(SIGPIPE);
+
+ err = check_object_process_error(err, status.buf, entry, cmd, ODB_HELPER_CAP_PUT);
+
+ trace_performance_since(start, "write_object_process");
+
+ return err;
+}
+
struct odb_helper *odb_helper_new(const char *name, int namelen)
{
struct odb_helper *o;
@@ -804,9 +863,9 @@ int odb_helper_for_each_object(struct odb_helper *o,
return 0;
}
-int odb_helper_write_object(struct odb_helper *o,
- const void *buf, size_t len,
- const char *type, unsigned char *sha1)
+int odb_helper_write_plain_object(struct odb_helper *o,
+ const void *buf, size_t len,
+ const char *type, unsigned char *sha1)
{
struct odb_helper_cmd cmd;
@@ -832,3 +891,14 @@ int odb_helper_write_object(struct odb_helper *o,
odb_helper_finish(o, &cmd);
return 0;
}
+
+int odb_helper_write_object(struct odb_helper *o,
+ const void *buf, size_t len,
+ const char *type, unsigned char *sha1)
+{
+ if (o->script_mode) {
+ return odb_helper_write_plain_object(o, buf, len, type, sha1);
+ } else {
+ return write_object_process(o, buf, len, type, sha1);
+ }
+}
--
2.13.1.565.gbfcd7a9048
