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 12/16] remote-svn: Activate import/export-marks for fast-import.
Date: Fri, 17 Aug 2012 22:25:53 +0200 [thread overview]
Message-ID: <1345235157-702-13-git-send-email-florian.achleitner.2.6.31@gmail.com> (raw)
In-Reply-To: <1345235157-702-12-git-send-email-florian.achleitner.2.6.31@gmail.com>
Enable import and export of a marks file by sending the appropriate
feature commands to fast-import before sending data.
Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
---
contrib/svn-fe/remote-svn.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/contrib/svn-fe/remote-svn.c b/contrib/svn-fe/remote-svn.c
index 80a089a..0643a4c 100644
--- a/contrib/svn-fe/remote-svn.c
+++ b/contrib/svn-fe/remote-svn.c
@@ -12,6 +12,7 @@ static const char *url;
static int dump_from_file;
static const char *private_ref;
static const char *remote_ref = "refs/heads/master";
+static const char *marksfilename;
static int cmd_capabilities(const char *line);
static int cmd_import(const char *line);
@@ -74,6 +75,10 @@ static int cmd_import(const char *line)
die("Unable to start %s, code %d", svndump_proc.argv[0], code);
dumpin_fd = svndump_proc.out;
}
+ /* setup marks file import/export */
+ printf("feature import-marks-if-exists=%s\n"
+ "feature export-marks=%s\n", marksfilename, marksfilename);
+
svndump_init_fd(dumpin_fd, STDIN_FILENO);
svndump_read(url, private_ref);
svndump_deinit();
@@ -172,6 +177,10 @@ int main(int argc, const char **argv)
strbuf_addf(&buf, "refs/svn/%s/master", remote->name);
private_ref = strbuf_detach(&buf, NULL);
+ strbuf_addf(&buf, "%s/info/fast-import/remote-svn/%s.marks",
+ get_git_dir(), remote->name);
+ marksfilename = strbuf_detach(&buf, NULL);
+
while(1) {
if (strbuf_getline(&buf, stdin, '\n') == EOF) {
if (ferror(stdin))
@@ -187,5 +196,6 @@ int main(int argc, const char **argv)
strbuf_release(&buf);
free((void*)url);
free((void*)private_ref);
+ free((void*)marksfilename);
return 0;
}
--
1.7.9.5
next prev parent reply other threads:[~2012-08-17 20:27 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 ` [PATCH/RFC v4 01/16] Implement a remote helper for svn in C Florian Achleitner
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 ` Florian Achleitner [this message]
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-13-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).