From: Sverre Rabbelier <srabbelier@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>, "Jeff King" <peff@peff.net>,
Git List <git@vger.kernel.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Sverre Rabbelier <srabbelier@gmail.com>
Subject: [PATCH 14/19] transport-helper: use the new done feature where possible
Date: Wed, 8 Jun 2011 20:48:45 +0200 [thread overview]
Message-ID: <1307558930-16074-15-git-send-email-srabbelier@gmail.com> (raw)
In-Reply-To: <1307558930-16074-1-git-send-email-srabbelier@gmail.com>
In other words, use fast-export --use-done-feature to add a 'done'
command at the end of streams passed to remote helpers' "import"
commands, and teach the remote helpers implementing "export" to use
the 'done' command in turn when producing their streams.
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
---
Unchanged from my original series.
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 9658355..a8e47d9 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, args)
+ 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 7f3c6c6..b0361c2 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;
@@ -762,8 +760,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.5.1.292.g728120
next prev parent reply other threads:[~2011-06-08 18:51 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-08 18:48 [PATCH 00/19] remote-helper improvements Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 01/19] transport-helper: fix minor leak in push_refs_with_export Sverre Rabbelier
2011-06-08 21:57 ` Jeff King
2011-06-08 22:08 ` Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 02/19] t5800: factor out some ref tests Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 03/19] t5800: document some non-functional parts of remote helpers Sverre Rabbelier
2011-06-08 19:28 ` Jonathan Nieder
2011-06-08 19:36 ` Jonathan Nieder
2011-06-08 19:51 ` Sverre Rabbelier
2011-06-08 21:13 ` Sverre Rabbelier
2011-06-09 12:45 ` Sverre Rabbelier
2011-06-10 1:18 ` Jeff King
2011-06-08 18:48 ` [PATCH 04/19] teach remote-testgit to import non-HEAD refs Sverre Rabbelier
2011-06-08 19:30 ` Jonathan Nieder
2011-06-08 19:47 ` Sverre Rabbelier
2011-06-08 22:15 ` Jeff King
2011-06-08 23:48 ` Junio C Hamano
2011-06-09 6:23 ` Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 05/19] transport-helper: don't feed bogus refs to export push Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 06/19] git_remote_helpers: push all refs during a non-local export Sverre Rabbelier
2011-06-08 19:42 ` Jonathan Nieder
2011-06-08 22:19 ` Jeff King
2011-06-08 22:21 ` Sverre Rabbelier
2011-06-09 8:09 ` Jonathan Nieder
2011-06-09 8:29 ` Sverre Rabbelier
2011-06-09 8:43 ` Jonathan Nieder
2011-06-09 10:26 ` Sverre Rabbelier
2011-06-10 1:40 ` Jeff King
2011-06-08 18:48 ` [PATCH 07/19] remote-curl: accept empty line as terminator Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 08/19] git-remote-testgit: only push for non-local repositories Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 09/19] git-remote-testgit: fix error handling Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 10/19] fast-import: introduce 'done' command Sverre Rabbelier
2011-06-08 20:03 ` Jonathan Nieder
2011-06-08 20:07 ` Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 11/19] fast-export: support done feature Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 12/19] transport-helper: factor out push_update_refs_status Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 13/19] transport-helper: check status code of finish_command Sverre Rabbelier
2011-06-08 18:48 ` Sverre Rabbelier [this message]
2011-06-08 18:48 ` [PATCH 15/19] transport-helper: update ref status after push with export Sverre Rabbelier
2011-06-09 9:10 ` Jonathan Nieder
2011-06-09 10:23 ` Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 16/19] transport-helper: change import semantics Sverre Rabbelier
2011-06-08 20:47 ` Jonathan Nieder
2011-06-08 20:52 ` Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 17/19] transport-helper: export is no longer always the last command Sverre Rabbelier
2011-06-09 1:07 ` Junio C Hamano
2011-06-09 6:48 ` Sverre Rabbelier
2011-06-09 7:51 ` Jonathan Nieder
2011-06-09 8:28 ` Sverre Rabbelier
2011-06-13 15:24 ` Junio C Hamano
2011-06-08 18:48 ` [PATCH 18/19] transport-helper: Use capname for gitdir capability too Sverre Rabbelier
2011-06-08 20:54 ` Jonathan Nieder
2011-06-08 20:57 ` Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 19/19] transport-helper: implement marks location as capability Sverre Rabbelier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1307558930-16074-15-git-send-email-srabbelier@gmail.com \
--to=srabbelier@gmail.com \
--cc=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).