From: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>,
David Michael Barr <davidbarr@google.com>,
git@vger.kernel.org
Cc: florian.achleitner.2.6.31@gmail.com
Subject: [RFC 07/16] Allow reading svn dumps from files via file:// urls.
Date: Thu, 26 Jul 2012 09:32:28 +0200 [thread overview]
Message-ID: <1343287957-22040-8-git-send-email-florian.achleitner.2.6.31@gmail.com> (raw)
In-Reply-To: <1343287957-22040-7-git-send-email-florian.achleitner.2.6.31@gmail.com>
For testing as well as for importing large, already
available dumps, it's useful to bypass svnrdump and
replay the svndump from a file directly.
Add support for file:// urls in the remote url.
e.g. svn::file:///path/to/dump
When the remote helper finds an url starting with
file:// it tries to open that file instead of invoking svnrdump.
Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
---
contrib/svn-fe/remote-svn.c | 56 +++++++++++++++++++++++++++++--------------
1 file changed, 38 insertions(+), 18 deletions(-)
diff --git a/contrib/svn-fe/remote-svn.c b/contrib/svn-fe/remote-svn.c
index 29fc371..862b739 100644
--- a/contrib/svn-fe/remote-svn.c
+++ b/contrib/svn-fe/remote-svn.c
@@ -23,6 +23,7 @@ static inline void printd(const char *fmt, ...)
}
static const char *url;
+static int dump_from_file;
static const char *private_ref;
static const char *remote_ref = "refs/heads/master";
@@ -105,18 +106,28 @@ enum cmd_result cmd_import(struct strbuf *line)
}
printd("Opened fast-import back-pipe %s for reading.", back_pipe_env);
- 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;
+ if(dump_from_file) {
+ dumpin_fd = open(url, O_RDONLY);
+ if(dumpin_fd < 0) {
+ die_errno("Couldn't open svn dump file %s.", url);
+ }
+ }
+ else {
+ 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;
+
+ }
- 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, report_fd);
svndump_read(url, private_ref);
@@ -125,10 +136,12 @@ enum cmd_result cmd_import(struct strbuf *line)
close(dumpin_fd);
close(report_fd);
- code = finish_command(&svndump_proc);
- if (code)
- warning("%s, returned %d", svndump_proc.argv[0], code);
- argv_array_clear(&svndump_argv);
+ if(!dump_from_file) {
+ code = finish_command(&svndump_proc);
+ if (code)
+ warning("%s, returned %d", svndump_proc.argv[0], code);
+ argv_array_clear(&svndump_argv);
+ }
return SUCCESS;
}
@@ -191,9 +204,16 @@ int main(int argc, const char **argv)
else
warning("Excess arguments!");
- end_url_with_slash(&buf, url);
- url = strbuf_detach(&buf, NULL);
-
+ if (!prefixcmp(url, "file://")) {
+ dump_from_file = 1;
+ url = url_decode(url + sizeof("file://")-1);
+ printd("remote-svn uses a file as dump input.");
+ }
+ else {
+ dump_from_file = 0;
+ end_url_with_slash(&buf, url);
+ url = strbuf_detach(&buf, NULL);
+ }
printd("remote-svn starting with url %s", url);
strbuf_init(&buf, 0);
--
1.7.9.5
next prev parent reply other threads:[~2012-07-26 7:34 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-26 7:32 [RFC 00/16] GSOC remote-svn, rewritten patch series Florian Achleitner
2012-07-26 7:32 ` [RFC 01/16] Implement a remote helper for svn in C Florian Achleitner
2012-07-26 7:32 ` [RFC 02/16] Integrate remote-svn into svn-fe/Makefile Florian Achleitner
2012-07-26 7:32 ` [RFC 03/16] Add svndump_init_fd to allow reading dumps from arbitrary FDs Florian Achleitner
2012-07-26 7:32 ` [RFC 04/16] Add cat-blob report fifo from fast-import to remote-helper Florian Achleitner
2012-07-26 7:32 ` [RFC 05/16] remote-svn, vcs-svn: Enable fetching to private refs Florian Achleitner
2012-07-26 7:32 ` [RFC 06/16] Add a symlink 'git-remote-svn' in base dir Florian Achleitner
2012-07-26 7:32 ` Florian Achleitner [this message]
2012-07-26 7:32 ` [RFC 08/16] vcs-svn: add fast_export_note to create notes Florian Achleitner
2012-07-26 7:32 ` [RFC 09/16] Create a note for every imported commit containing svn metadata Florian Achleitner
2012-07-26 7:32 ` [RFC 10/16] When debug==1, start fast-import with "--stats" instead of "--quiet" Florian Achleitner
2012-07-26 7:32 ` [RFC 11/16] Add explanatory comment for transport-helpers refs mapping Florian Achleitner
2012-07-26 7:32 ` [RFC 12/16] remote-svn: add incremental import Florian Achleitner
2012-07-26 7:32 ` [RFC 13/16] Add a svnrdump-simulator replaying a dump file for testing Florian Achleitner
2012-07-26 7:32 ` [RFC 14/16] transport-helper: add import|export-marks to fast-import command line Florian Achleitner
2012-07-26 7:32 ` [RFC 15/16] remote-svn: add marks-file regeneration Florian Achleitner
2012-07-26 7:32 ` [RFC 16/16] Add a test script for remote-svn Florian Achleitner
2012-07-26 16:15 ` [RFC 14/16] transport-helper: add import|export-marks to fast-import command line Florian Achleitner
2012-07-28 7:06 ` Jonathan Nieder
2012-07-26 7:46 ` [RFC 01/16] Implement a remote helper for svn in C Jonathan Nieder
2012-07-26 8:02 ` Florian Achleitner
2012-07-26 8:14 ` Jonathan Nieder
2012-07-26 8:37 ` Florian Achleitner
2012-07-30 14:31 ` [RFC v2 00/16] GSOC remote-svn, rewritten patch series Florian Achleitner
2012-07-30 14:31 ` [RFC v2 01/16] Implement a remote helper for svn in C Florian Achleitner
2012-07-30 14:31 ` [RFC v2 02/16] Integrate remote-svn into svn-fe/Makefile Florian Achleitner
2012-07-30 14:31 ` [RFC v2 03/16] Add svndump_init_fd to allow reading dumps from arbitrary FDs Florian Achleitner
2012-07-30 14:31 ` [RFC v2 04/16] Add cat-blob report fifo from fast-import to remote-helper Florian Achleitner
2012-07-30 14:31 ` [RFC v2 05/16] remote-svn, vcs-svn: Enable fetching to private refs Florian Achleitner
2012-07-30 14:31 ` [RFC v2 06/16] Add a symlink 'git-remote-svn' in base dir Florian Achleitner
2012-07-30 14:31 ` [RFC v2 07/16] Allow reading svn dumps from files via file:// urls Florian Achleitner
2012-07-30 14:31 ` [RFC v2 08/16] vcs-svn: add fast_export_note to create notes Florian Achleitner
2012-07-30 14:31 ` [RFC v2 09/16] Create a note for every imported commit containing svn metadata Florian Achleitner
2012-07-30 14:31 ` [RFC v2 10/16] When debug==1, start fast-import with "--stats" instead of "--quiet" Florian Achleitner
2012-07-30 14:31 ` [RFC v2 11/16] Add explanatory comment for transport-helpers refs mapping Florian Achleitner
2012-07-30 14:31 ` [RFC v2 12/16] remote-svn: add incremental import Florian Achleitner
2012-07-30 14:31 ` [RFC v2 13/16] Add a svnrdump-simulator replaying a dump file for testing Florian Achleitner
2012-07-30 14:31 ` [RFC v2 14/16] transport-helper: add import|export-marks to fast-import command line Florian Achleitner
2012-07-30 14:31 ` [RFC v2 15/16] remote-svn: add marks-file regeneration Florian Achleitner
2012-07-30 14:31 ` [RFC v2 16/16] Add a test script for remote-svn Florian Achleitner
2012-07-30 17:08 ` [RFC v2 11/16] Add explanatory comment for transport-helpers refs mapping Jonathan Nieder
2012-07-30 17:25 ` Junio C Hamano
2012-07-30 17:38 ` Junio C Hamano
2012-07-30 19:15 ` Jonathan Nieder
2012-07-30 20:15 ` Florian Achleitner
2012-07-30 16:28 ` [RFC v2 01/16] Implement a remote helper for svn in C Junio C Hamano
2012-07-31 19:26 ` Florian Achleitner
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=1343287957-22040-8-git-send-email-florian.achleitner.2.6.31@gmail.com \
--to=florian.achleitner.2.6.31@gmail.com \
--cc=davidbarr@google.com \
--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).