diff options
| author | Florian Achleitner <florian.achleitner.2.6.31@gmail.com> | 2012-09-19 15:21:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-07 21:10:17 (GMT) |
| commit | 8d7cd8eb3b4cee410ee391f7d59610e2f90adf4f (patch) | |
| tree | 71e832fa9bf3a6b0e5e2a9aeac41ee20d2ec45c0 | |
| parent | a9a55613cb9b92e0dd65f8c4554fd7b562377a6e (diff) | |
| download | git-8d7cd8eb3b4cee410ee391f7d59610e2f90adf4f.zip git-8d7cd8eb3b4cee410ee391f7d59610e2f90adf4f.tar.gz git-8d7cd8eb3b4cee410ee391f7d59610e2f90adf4f.tar.bz2 | |
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>
| -rw-r--r-- | remote-testsvn.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/remote-testsvn.c b/remote-testsvn.c index 67466a9..45eba9f 100644 --- a/remote-testsvn.c +++ b/remote-testsvn.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); @@ -73,6 +74,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(); @@ -145,7 +150,7 @@ static int do_command(struct strbuf *line) int main(int argc, const char **argv) { struct strbuf buf = STRBUF_INIT, url_sb = STRBUF_INIT, - private_ref_sb = STRBUF_INIT; + private_ref_sb = STRBUF_INIT, marksfilename_sb = STRBUF_INIT; static struct remote *remote; const char *url_in; @@ -171,6 +176,10 @@ int main(int argc, const char **argv) strbuf_addf(&private_ref_sb, "refs/svn/%s/master", remote->name); private_ref = private_ref_sb.buf; + strbuf_addf(&marksfilename_sb, "%s/info/fast-import/remote-svn/%s.marks", + get_git_dir(), remote->name); + marksfilename = marksfilename_sb.buf; + while (1) { if (strbuf_getline(&buf, stdin, '\n') == EOF) { if (ferror(stdin)) @@ -186,5 +195,6 @@ int main(int argc, const char **argv) strbuf_release(&buf); strbuf_release(&url_sb); strbuf_release(&private_ref_sb); + strbuf_release(&marksfilename_sb); return 0; } |