diff options
| author | Florian Achleitner <florian.achleitner.2.6.31@gmail.com> | 2012-09-19 17:21:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-07 14:10:17 -0700 |
| commit | 271fd1fc2a25ebfc1782aab0d39b613555d22315 (patch) | |
| tree | 04ddbc0d11c13a2b9e62a7e2724d879b73427d0a /vcs-svn/svndump.c | |
| parent | 19ba02af476a1d17308f06bc78544d712923ed60 (diff) | |
| download | git-271fd1fc2a25ebfc1782aab0d39b613555d22315.tar.gz git-271fd1fc2a25ebfc1782aab0d39b613555d22315.tar.xz | |
remote-svn, vcs-svn: Enable fetching to private refs
The reference to update by the fast-import stream is hard-coded. When
fetching from a remote the remote-helper shall update refs in a
private namespace, i.e. a private subdir of refs/. This namespace is
defined by the 'refspec' capability, that the remote-helper advertises
as a reply to the 'capabilities' command.
Extend svndump and fast-export to allow passing the target ref.
Update svn-fe to be compatible.
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>
Diffstat (limited to 'vcs-svn/svndump.c')
| -rw-r--r-- | vcs-svn/svndump.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c index d81a078b8..c8a5b7eeb 100644 --- a/vcs-svn/svndump.c +++ b/vcs-svn/svndump.c @@ -299,13 +299,13 @@ static void handle_node(void) node_ctx.text_length, &input); } -static void begin_revision(void) +static void begin_revision(const char *remote_ref) { if (!rev_ctx.revision) /* revision 0 gets no git commit. */ return; fast_export_begin_commit(rev_ctx.revision, rev_ctx.author.buf, &rev_ctx.log, dump_ctx.uuid.buf, dump_ctx.url.buf, - rev_ctx.timestamp); + rev_ctx.timestamp, remote_ref); } static void end_revision(void) @@ -314,7 +314,7 @@ static void end_revision(void) fast_export_end_commit(rev_ctx.revision); } -void svndump_read(const char *url) +void svndump_read(const char *url, const char *local_ref) { char *val; char *t; @@ -353,7 +353,7 @@ void svndump_read(const char *url) if (active_ctx == NODE_CTX) handle_node(); if (active_ctx == REV_CTX) - begin_revision(); + begin_revision(local_ref); if (active_ctx != DUMP_CTX) end_revision(); active_ctx = REV_CTX; @@ -366,7 +366,7 @@ void svndump_read(const char *url) if (active_ctx == NODE_CTX) handle_node(); if (active_ctx == REV_CTX) - begin_revision(); + begin_revision(local_ref); active_ctx = NODE_CTX; reset_node_ctx(val); break; @@ -463,7 +463,7 @@ void svndump_read(const char *url) if (active_ctx == NODE_CTX) handle_node(); if (active_ctx == REV_CTX) - begin_revision(); + begin_revision(local_ref); if (active_ctx != DUMP_CTX) end_revision(); } |