Previously, the helper code would disconnect the helper before
starting fast-import. This was needed because there was no way to signal
that the helper was done other than to close stdout (which it would
do after importing iff the helper noticed it had been disconnected).
Instead, request that the fast-export uses the 'done' command to
signal when it is done exporting, so that we can disconnect the
helper at a time of our choosing.
---
I really like what this does for the sanity of the import
implementation, it makes it much more like a regular (re-entrant)
command, rather than the "sorry, you're done now" way it is now.
git-remote-testgit.py | 2 ++
transport-helper.c | 8 ++------
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/git-remote-testgit.py b/git-remote-testgit.py
index df9d512..612cb5a 100644
--- a/git-remote-testgit.py
+++ b/git-remote-testgit.py
@@ -124,6 +124,8 @@ def do_import(repo, args):
repo = update_local_repo(repo)
repo.exporter.export_repo(repo.gitdir)
+ print "done"
+
def do_export(repo, args):
"""Imports a fast-import stream from git to testgit.
diff --git a/transport-helper.c b/transport-helper.c
index 4a2826d..5647595 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -375,8 +375,9 @@ static int get_exporter(struct transport *transport,
/* we need to duplicate helper->in because we want to use it after
* fastexport is done with it. */
fastexport->out = dup(helper->in);
- fastexport->argv = xcalloc(4 + revlist_args->nr, sizeof(*fastexport->argv));
+ fastexport->argv = xcalloc(5 + revlist_args->nr, sizeof(*fastexport->argv));
fastexport->argv[argc++] = "fast-export";
+ fastexport->argv[argc++] = "--use-done-feature";
if (export_marks)
fastexport->argv[argc++] = export_marks;
if (import_marks)
@@ -412,11 +413,8 @@ static int fetch_with_import(struct transport *transport,
sendline(data, &buf);
strbuf_reset(&buf);
}
- if(disconnect_helper(transport))
- die("Error while disconnecting helper");
if (finish_command(&fastimport))
die("Error while running fast-import");
-
free(fastimport.argv);
fastimport.argv = NULL;
@@ -758,8 +756,6 @@ static int push_refs_with_export(struct transport *transport,
data->no_disconnect_req = 1;
if(finish_command(&exporter))
die("Error while running fast-export");
- if(disconnect_helper(transport))
- die("Error while disconnecting helper");
return 0;
}
--
1.7.2.1.240.g6a95c3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html