remote-svn: Activate import/export-marks for fast-import
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> Acked-by: David Michael Barr <b@rr-dav.id.au> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Florian Achleitner committed
Sep 19, 2012 at 17:21 UTC
8d7cd8eb3b4cee410ee391f7d59610e2f90adf4f
1 file changed
+11
-1
remote-testsvn.c
+11
-1
@@ -12,6 +12,7 @@ static const char *url;
12
static int dump_from_file;
13
static const char *private_ref;
14
static const char *remote_ref = "refs/heads/master";
15
+static const char *marksfilename;
16
17
static int cmd_capabilities(const char *line);
18
static int cmd_import(const char *line);
@@ -73,6 +74,10 @@ static int cmd_import(const char *line)
74
die("Unable to start %s, code %d", svndump_proc.argv[0], code);
75
dumpin_fd = svndump_proc.out;
76
}
77
+ /* setup marks file import/export */
78
+ printf("feature import-marks-if-exists=%s\n"
79
+ "feature export-marks=%s\n", marksfilename, marksfilename);
80
+
81
svndump_init_fd(dumpin_fd, STDIN_FILENO);
82
svndump_read(url, private_ref);
83
svndump_deinit();
@@ -145,7 +150,7 @@ static int do_command(struct strbuf *line)
150
int main(int argc, const char **argv)
151
{
152
struct strbuf buf = STRBUF_INIT, url_sb = STRBUF_INIT,
148
- private_ref_sb = STRBUF_INIT;
153
+ private_ref_sb = STRBUF_INIT, marksfilename_sb = STRBUF_INIT;
154
static struct remote *remote;
155
const char *url_in;
156
@@ -171,6 +176,10 @@ int main(int argc, const char **argv)
176
strbuf_addf(&private_ref_sb, "refs/svn/%s/master", remote->name);
177
private_ref = private_ref_sb.buf;
178
179
+ strbuf_addf(&marksfilename_sb, "%s/info/fast-import/remote-svn/%s.marks",
180
+ get_git_dir(), remote->name);
181
+ marksfilename = marksfilename_sb.buf;
182
+
183
while (1) {
184
if (strbuf_getline(&buf, stdin, '\n') == EOF) {
185
if (ferror(stdin))
@@ -186,5 +195,6 @@ int main(int argc, const char **argv)
195
strbuf_release(&buf);
196
strbuf_release(&url_sb);
197
strbuf_release(&private_ref_sb);
198
+ strbuf_release(&marksfilename_sb);
199
return 0;
200
}