[PATCH 07/13] transport-helper: change import semantics
From: Sverre Rabbelier <hidden>
Date: 2016-06-15 22:49:24
Subsystem:
the rest · Maintainer:
Linus Torvalds
Currently the helper must somehow guess how many import statements to read before it starts outputting its fast-export stream. This is because the remote helper infrastructure runs fast-import only once, so the helper is forced to output one stream for all import commands it will receive. The only reason this worked in the past was because only one ref was imported at a time. Change the semantics of the import statement such that it matches that of the list statement. That is, 'import\n' is followed by a list of refs that should be exported, followed by '\n'. --- This changes the protcol a bit, but I don't think we have many users of the 'import' command yet, and if we do I would assume they're paying attention to development in the remote helper space. git-remote-testgit.py | 12 ++++++++++-- transport-helper.c | 7 ++++++- 2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/git-remote-testgit.py b/git-remote-testgit.py
index 342a05d..50341ce 100644
--- a/git-remote-testgit.py
+++ b/git-remote-testgit.py@@ -115,12 +115,20 @@ def do_import(repo, args): """Exports a fast-import stream from testgit for git to import. """ - if len(args) != 1: - die("Import needs exactly one ref") + if args: + die("Import expects its ref seperately") if not repo.gitdir: die("Need gitdir to import") + refs = [] + + while True: + line = sys.stdin.readline() + if line == '\n': + break + refs.append(line.strip()) + repo = update_local_repo(repo) repo.exporter.export_repo(repo.gitdir)
diff --git a/transport-helper.c b/transport-helper.c
index ecaea25..13ebb3b 100644
--- a/transport-helper.c
+++ b/transport-helper.c@@ -404,15 +404,20 @@ static int fetch_with_import(struct transport *transport, if (get_importer(transport, &fastimport)) die("Couldn't run fast-import"); + write_constant(data->helper->in, "import\n"); + for (i = 0; i < nr_heads; i++) { posn = to_fetch[i]; if (posn->status & REF_STATUS_UPTODATE) continue; - strbuf_addf(&buf, "import %s\n", posn->name); + strbuf_addf(&buf, "%s\n", posn->name); sendline(data, &buf); strbuf_reset(&buf); } + + write_constant(data->helper->in, "\n"); + if (finish_command(&fastimport)) die("Error while running fast-import"); free(fastimport.argv);
--
1.7.2.1.240.g6a95c3