From: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
To: git@vger.kernel.org
Cc: David Michael Barr <b@rr-dav.id.au>,
Jonathan Nieder <jrnieder@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
Subject: [PATCH/RFC v4 01/16] Implement a remote helper for svn in C.
Date: Fri, 17 Aug 2012 22:25:42 +0200 [thread overview]
Message-ID: <1345235157-702-2-git-send-email-florian.achleitner.2.6.31@gmail.com> (raw)
In-Reply-To: <1345235157-702-1-git-send-email-florian.achleitner.2.6.31@gmail.com>
Enable basic fetching from subversion repositories. When processing
remote URLs starting with svn::, git invokes this remote-helper.
It starts svnrdump to extract revisions from the subversion repository
in the 'dump file format', and converts them to a git-fast-import stream
using the functions of vcs-svn/.
Imported refs are created in a private namespace at
refs/svn/<remote-name>/master.
The revision history is imported linearly (no branch detection) and
completely, i.e. from revision 0 to HEAD.
The 'bidi-import' capability is used. The remote-helper expects data
from fast-import on its stdin. It buffers a batch of 'import' command
lines in a string_list before starting to process them.
Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
---
contrib/svn-fe/remote-svn.c | 174 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 174 insertions(+)
create mode 100644 contrib/svn-fe/remote-svn.c
diff --git a/contrib/svn-fe/remote-svn.c b/contrib/svn-fe/remote-svn.c
new file mode 100644
index 0000000..b853d54
--- /dev/null
+++ b/contrib/svn-fe/remote-svn.c
@@ -0,0 +1,174 @@
+#include "cache.h"
+#include "remote.h"
+#include "strbuf.h"
+#include "url.h"
+#include "exec_cmd.h"
+#include "run-command.h"
+#include "svndump.h"
+#include "notes.h"
+#include "argv-array.h"
+
+static const char *url;
+static const char *private_ref;
+static const char *remote_ref = "refs/heads/master";
+
+static int cmd_capabilities(const char *line);
+static int cmd_import(const char *line);
+static int cmd_list(const char *line);
+
+typedef int (*input_command_handler)(const char *);
+struct input_command_entry {
+ const char *name;
+ input_command_handler fn;
+ unsigned char batchable; /* whether the command starts or is part of a batch */
+};
+
+static const struct input_command_entry input_command_list[] = {
+ { "capabilities", cmd_capabilities, 0 },
+ { "import", cmd_import, 1 },
+ { "list", cmd_list, 0 },
+ { NULL, NULL }
+};
+
+static int cmd_capabilities(const char *line) {
+ printf("import\n");
+ printf("bidi-import\n");
+ printf("refspec %s:%s\n\n", remote_ref, private_ref);
+ fflush(stdout);
+ return 0;
+}
+
+static void terminate_batch(void)
+{
+ /* terminate a current batch's fast-import stream */
+ printf("done\n");
+ fflush(stdout);
+}
+
+static int cmd_import(const char *line)
+{
+ int code;
+ int dumpin_fd;
+ unsigned int startrev = 0;
+ struct argv_array svndump_argv = ARGV_ARRAY_INIT;
+ struct child_process svndump_proc;
+
+ memset(&svndump_proc, 0, sizeof(struct child_process));
+ svndump_proc.out = -1;
+ argv_array_push(&svndump_argv, "svnrdump");
+ argv_array_push(&svndump_argv, "dump");
+ argv_array_push(&svndump_argv, url);
+ argv_array_pushf(&svndump_argv, "-r%u:HEAD", startrev);
+ svndump_proc.argv = svndump_argv.argv;
+
+ code = start_command(&svndump_proc);
+ if (code)
+ die("Unable to start %s, code %d", svndump_proc.argv[0], code);
+ dumpin_fd = svndump_proc.out;
+
+ svndump_init_fd(dumpin_fd, STDIN_FILENO);
+ svndump_read(url, private_ref);
+ svndump_deinit();
+ svndump_reset();
+
+ close(dumpin_fd);
+ code = finish_command(&svndump_proc);
+ if (code)
+ warning("%s, returned %d", svndump_proc.argv[0], code);
+ argv_array_clear(&svndump_argv);
+
+ return 0;
+}
+
+static int cmd_list(const char *line)
+{
+ printf("? %s\n\n", remote_ref);
+ fflush(stdout);
+ return 0;
+}
+
+static int do_command(struct strbuf *line)
+{
+ const struct input_command_entry *p = input_command_list;
+ static struct string_list batchlines = STRING_LIST_INIT_DUP;
+ static const struct input_command_entry *batch_cmd;
+ /*
+ * commands can be grouped together in a batch.
+ * Batches are ended by \n. If no batch is active the program ends.
+ * During a batch all lines are buffered and passed to the handler function
+ * when the batch is terminated.
+ */
+ if (line->len == 0) {
+ if (batch_cmd) {
+ struct string_list_item *item;
+ for_each_string_list_item(item, &batchlines)
+ batch_cmd->fn(item->string);
+ terminate_batch();
+ batch_cmd = NULL;
+ string_list_clear(&batchlines, 0);
+ return 0; /* end of the batch, continue reading other commands. */
+ }
+ return 1; /* end of command stream, quit */
+ }
+ if (batch_cmd) {
+ if (prefixcmp(batch_cmd->name, line->buf))
+ die("Active %s batch interrupted by %s", batch_cmd->name, line->buf);
+ /* buffer batch lines */
+ string_list_append(&batchlines, line->buf);
+ return 0;
+ }
+
+ for (p = input_command_list; p->name; p++) {
+ if (!prefixcmp(line->buf, p->name) && (strlen(p->name) == line->len ||
+ line->buf[strlen(p->name)] == ' ')) {
+ if (p->batchable) {
+ batch_cmd = p;
+ string_list_append(&batchlines, line->buf);
+ return 0;
+ }
+ return p->fn(line->buf);
+ }
+ }
+ die("Unknown command '%s'\n", line->buf);
+ return 0;
+}
+
+int main(int argc, const char **argv)
+{
+ struct strbuf buf = STRBUF_INIT;
+ static struct remote *remote;
+ const char *url_in;
+
+ git_extract_argv0_path(argv[0]);
+ setup_git_directory();
+ if (argc < 2 || argc > 3) {
+ usage("git-remote-svn <remote-name> [<url>]");
+ return 1;
+ }
+
+ remote = remote_get(argv[1]);
+ url_in = (argc == 3) ? argv[2] : remote->url[0];
+
+ end_url_with_slash(&buf, url_in);
+ url = strbuf_detach(&buf, NULL);
+
+ strbuf_addf(&buf, "refs/svn/%s/master", remote->name);
+ private_ref = strbuf_detach(&buf, NULL);
+
+ while(1) {
+ if (strbuf_getline(&buf, stdin, '\n') == EOF) {
+ if (ferror(stdin))
+ die("Error reading command stream");
+ else
+ die("Unexpected end of command stream");
+ }
+ if (do_command(&buf))
+ break;
+ strbuf_reset(&buf);
+ }
+
+ strbuf_release(&buf);
+ free((void*)url);
+ free((void*)private_ref);
+ return 0;
+}
--
1.7.9.5
next prev parent reply other threads:[~2012-08-17 20:26 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-17 20:25 [PATCH/RFC v4 01/16] GSOC remote-svn Florian Achleitner
2012-08-17 20:25 ` Florian Achleitner [this message]
2012-08-17 20:25 ` [PATCH/RFC v4 02/16] Integrate remote-svn into svn-fe/Makefile Florian Achleitner
2012-08-17 20:25 ` [PATCH/RFC v4 03/16] Add svndump_init_fd to allow reading dumps from arbitrary FDs Florian Achleitner
2012-08-17 20:25 ` [PATCH/RFC v4 04/16] Add argv_array_detach and argv_array_free_detached Florian Achleitner
2012-08-17 20:25 ` [PATCH/RFC v4 05/16] Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability Florian Achleitner
2012-08-17 20:25 ` [PATCH/RFC v4 06/16] Add documentation for the 'bidi-import' capability of remote-helpers Florian Achleitner
2012-08-17 20:25 ` [PATCH/RFC v4 07/16] When debug==1, start fast-import with "--stats" instead of "--quiet" Florian Achleitner
2012-08-17 20:25 ` [PATCH/RFC v4 08/16] remote-svn, vcs-svn: Enable fetching to private refs Florian Achleitner
2012-08-17 20:25 ` [PATCH/RFC v4 09/16] Allow reading svn dumps from files via file:// urls Florian Achleitner
2012-08-17 20:25 ` [PATCH/RFC v4 10/16] vcs-svn: add fast_export_note to create notes Florian Achleitner
2012-08-17 20:25 ` [PATCH/RFC v4 11/16] Create a note for every imported commit containing svn metadata Florian Achleitner
2012-08-17 20:25 ` [PATCH/RFC v4 12/16] remote-svn: Activate import/export-marks for fast-import Florian Achleitner
2012-08-17 20:25 ` [PATCH/RFC v4 13/16] remote-svn: add incremental import Florian Achleitner
2012-08-17 20:25 ` [PATCH/RFC v4 14/16] Add a svnrdump-simulator replaying a dump file for testing Florian Achleitner
2012-08-17 20:25 ` [PATCH/RFC v4 15/16] remote-svn: add marks-file regeneration Florian Achleitner
2012-08-17 20:25 ` [PATCH/RFC v4 16/16] Add a test script for remote-svn Florian Achleitner
2012-08-18 4:16 ` [PATCH/RFC v4 01/16] GSOC remote-svn Junio C Hamano
2012-08-18 18:06 ` Florian Achleitner
2012-08-18 20:13 ` Junio C Hamano
2012-08-19 6:35 ` Junio C Hamano
2012-08-20 6:21 ` Florian Achleitner
2012-08-20 6:51 ` Junio C Hamano
2012-08-20 13:52 ` Florian Achleitner
2012-08-20 16:23 ` Junio C Hamano
2012-08-20 16:43 ` Jonathan Nieder
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=1345235157-702-2-git-send-email-florian.achleitner.2.6.31@gmail.com \
--to=florian.achleitner.2.6.31@gmail.com \
--cc=b@rr-dav.id.au \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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).