From: Sverre Rabbelier <srabbelier@gmail.com>
To: "Git List" <git@vger.kernel.org>,
"Daniel Barkalow" <barkalow@iabervon.org>,
"Ramkumar Ramachandra" <artagnon@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>
Cc: Sverre Rabbelier <srabbelier@gmail.com>,
Daniel Barkalow <barkalow@iabervon.org>
Subject: [PATCH 10/13] transport-helper: implement marks location as capability
Date: Sat, 28 Aug 2010 22:45:37 -0500 [thread overview]
Message-ID: <1283053540-27042-11-git-send-email-srabbelier@gmail.com> (raw)
In-Reply-To: <1283053540-27042-1-git-send-email-srabbelier@gmail.com>
While this requires the helper to flush stdout after listing 'gitdir'
as capability, and read a command (the 'gitdir' response from the
remote helper infrastructure) right after that, this is more elegant
and does not require an ad-hoc exchange of values.
CC: Daniel Barkalow <barkalow@iabervon.org>
---
Daniel made some fuss about the ad-hoc exchange when I first sent
the 'export command' series for review, and it's been nagging me.
As you can see in the remote-testgit implementation, it's a bit
icky on the helper side (you have to flush sdout and read another
command in the middle of responding to 'capabilities'), but I think
it's better than the alternative.
git-remote-testgit.py | 29 ++++++++++++++++-------------
transport-helper.c | 47 ++++++++++++++++++-----------------------------
2 files changed, 34 insertions(+), 42 deletions(-)
diff --git a/git-remote-testgit.py b/git-remote-testgit.py
index 50341ce..e2b213d 100644
--- a/git-remote-testgit.py
+++ b/git-remote-testgit.py
@@ -71,8 +71,24 @@ def do_capabilities(repo, args):
print "import"
print "export"
print "gitdir"
+
+ sys.stdout.flush()
+ if not read_one_line(repo):
+ die("Expected gitdir, got empty line")
+
print "refspec refs/heads/*:%s*" % repo.prefix
+ dirname = repo.get_base_path(repo.gitdir)
+
+ if not os.path.exists(dirname):
+ os.makedirs(dirname)
+
+ path = os.path.join(dirname, 'testgit.marks')
+
+ print "*export-marks %s" % path
+ if os.path.exists(path):
+ print "*import-marks %s" % path
+
print # end capabilities
@@ -142,19 +158,6 @@ def do_export(repo, args):
if not repo.gitdir:
die("Need gitdir to export")
- dirname = repo.get_base_path(repo.gitdir)
-
- if not os.path.exists(dirname):
- os.makedirs(dirname)
-
- path = os.path.join(dirname, 'testgit.marks')
- print path
- if os.path.exists(path):
- print path
- else:
- print ""
- sys.stdout.flush()
-
update_local_repo(repo)
repo.importer.do_import(repo.gitdir)
repo.non_local.push(repo.gitdir)
diff --git a/transport-helper.c b/transport-helper.c
index 82bdad3..0edc1d5 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -23,6 +23,8 @@ struct helper_data
push : 1,
connect : 1,
no_disconnect_req : 1;
+ char *export_marks;
+ char *import_marks;
/* These go from remote name (as in "list") to private name */
struct refspec *refspecs;
int refspec_nr;
@@ -179,6 +181,16 @@ static struct child_process *get_helper(struct transport *transport)
strbuf_addf(&gitdir, "gitdir %s\n", get_git_dir());
sendline(data, &gitdir);
strbuf_release(&gitdir);
+ } else if (!prefixcmp(capname, "export-marks ")) {
+ struct strbuf arg = STRBUF_INIT;
+ strbuf_addstr(&arg, "--export-marks=");
+ strbuf_addstr(&arg, capname + strlen("export-marks "));
+ data->export_marks = strbuf_detach(&arg, NULL);
+ } else if (!prefixcmp(capname, "import-marks")) {
+ struct strbuf arg = STRBUF_INIT;
+ strbuf_addstr(&arg, "--import-marks=");
+ strbuf_addstr(&arg, capname + strlen("import-marks "));
+ data->import_marks = strbuf_detach(&arg, NULL);
} else if (mandatory) {
die("Unknown mandatory capability %s. This remote "
"helper probably needs newer version of Git.\n",
@@ -364,10 +376,9 @@ static int get_importer(struct transport *transport, struct child_process *fasti
static int get_exporter(struct transport *transport,
struct child_process *fastexport,
- const char *export_marks,
- const char *import_marks,
struct string_list *revlist_args)
{
+ struct helper_data *data = transport->data;
struct child_process *helper = get_helper(transport);
int argc = 0, i;
memset(fastexport, 0, sizeof(*fastexport));
@@ -378,10 +389,10 @@ static int get_exporter(struct transport *transport,
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)
- fastexport->argv[argc++] = import_marks;
+ if (data->export_marks)
+ fastexport->argv[argc++] = data->export_marks;
+ if (data->import_marks)
+ fastexport->argv[argc++] = data->import_marks;
for (i = 0; i < revlist_args->nr; i++)
fastexport->argv[argc++] = revlist_args->items[i].string;
@@ -708,7 +719,6 @@ static int push_refs_with_export(struct transport *transport,
struct ref *ref;
struct child_process *helper, exporter;
struct helper_data *data = transport->data;
- char *export_marks = NULL, *import_marks = NULL;
struct string_list revlist_args = { NULL, 0, 0 };
struct strbuf buf = STRBUF_INIT;
@@ -716,26 +726,6 @@ static int push_refs_with_export(struct transport *transport,
write_constant(helper->in, "export\n");
- recvline(data, &buf);
- if (debug)
- fprintf(stderr, "Debug: Got export_marks '%s'\n", buf.buf);
- if (buf.len) {
- struct strbuf arg = STRBUF_INIT;
- strbuf_addstr(&arg, "--export-marks=");
- strbuf_addbuf(&arg, &buf);
- export_marks = strbuf_detach(&arg, NULL);
- }
-
- recvline(data, &buf);
- if (debug)
- fprintf(stderr, "Debug: Got import_marks '%s'\n", buf.buf);
- if (buf.len) {
- struct strbuf arg = STRBUF_INIT;
- strbuf_addstr(&arg, "--import-marks=");
- strbuf_addbuf(&arg, &buf);
- import_marks = strbuf_detach(&arg, NULL);
- }
-
strbuf_reset(&buf);
for (ref = remote_refs; ref; ref = ref->next) {
@@ -754,8 +744,7 @@ static int push_refs_with_export(struct transport *transport,
}
- if (get_exporter(transport, &exporter,
- export_marks, import_marks, &revlist_args))
+ if (get_exporter(transport, &exporter, &revlist_args))
die("Couldn't run fast-export");
if(finish_command(&exporter))
--
1.7.2.1.240.g6a95c3
next prev parent reply other threads:[~2010-08-29 3:47 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-29 3:45 [PATCH 00/13] remote helper improvements Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 01/13] fast-import: add the 'done' command Sverre Rabbelier
2010-08-29 18:59 ` Daniel Barkalow
2010-08-29 20:23 ` Sverre Rabbelier
2010-08-29 21:24 ` Jonathan Nieder
2010-08-29 21:28 ` Sverre Rabbelier
2010-08-29 22:32 ` Jonathan Nieder
2010-08-30 0:30 ` Sverre Rabbelier
2010-08-30 2:02 ` Jonathan Nieder
2010-08-30 2:08 ` Sverre Rabbelier
2010-08-30 2:12 ` Jonathan Nieder
2011-02-13 9:42 ` Jonathan Nieder
2010-08-29 3:45 ` [PATCH 02/13] fast-export: support done feature Sverre Rabbelier
2010-08-29 19:15 ` Daniel Barkalow
2010-08-29 20:25 ` Sverre Rabbelier
2010-08-29 23:42 ` Tay Ray Chuan
2010-08-30 0:32 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 03/13] transport-helper: factor out push_update_refs_status Sverre Rabbelier
2010-08-29 21:36 ` Jonathan Nieder
2010-08-29 21:45 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 04/13] transport-helper: check status code of finish_command Sverre Rabbelier
2010-08-29 21:52 ` Jonathan Nieder
2010-08-29 3:45 ` [PATCH 05/13] transport-helper: use the new done feature to properly do imports Sverre Rabbelier
2010-08-29 22:02 ` Jonathan Nieder
2010-08-30 0:28 ` Sverre Rabbelier
2010-08-29 3:45 ` [RFC PATCH 06/13] transport-helper: update ref status after push with export Sverre Rabbelier
2010-08-29 22:25 ` Jonathan Nieder
2010-08-30 0:29 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 07/13] transport-helper: change import semantics Sverre Rabbelier
2010-08-29 19:29 ` Daniel Barkalow
2010-08-29 20:26 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 08/13] transport-helper: export should disconnect too Sverre Rabbelier
2010-08-29 19:32 ` Daniel Barkalow
2010-08-29 20:28 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 09/13] transport-helper: Use capname for gitdir capability too Sverre Rabbelier
2010-08-30 1:05 ` Jonathan Nieder
2010-08-29 3:45 ` Sverre Rabbelier [this message]
2010-08-29 19:52 ` [PATCH 10/13] transport-helper: implement marks location as capability Daniel Barkalow
2010-08-29 20:17 ` Sverre Rabbelier
2010-08-30 1:31 ` Jonathan Nieder
2010-08-30 1:35 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 11/13] remote-curl: accept empty line as terminator Sverre Rabbelier
2010-08-30 1:39 ` Jonathan Nieder
2010-08-30 2:02 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 12/13] git-remote-testgit: only push for non-local repositories Sverre Rabbelier
2010-08-30 1:48 ` Jonathan Nieder
2010-08-30 1:59 ` Sverre Rabbelier
2010-08-30 2:09 ` Jonathan Nieder
2010-08-29 3:45 ` [PATCH 13/13] git-remote-testgit: fix error handling Sverre Rabbelier
2010-08-30 1:53 ` [PATCH 00/13] remote helper improvements Jonathan Nieder
2010-08-30 2:01 ` Sverre Rabbelier
[not found] ` <1283137728899-5476616.post@n2.nabble.com>
2010-08-30 5:54 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1283053540-27042-11-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 \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).