From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Achleitner Subject: [PATCH v8 08/16] remote-svn, vcs-svn: Enable fetching to private refs Date: Wed, 19 Sep 2012 17:21:22 +0200 Message-ID: <1348068090-31988-9-git-send-email-florian.achleitner.2.6.31@gmail.com> References: <1348068090-31988-1-git-send-email-florian.achleitner.2.6.31@gmail.com> <1348068090-31988-2-git-send-email-florian.achleitner.2.6.31@gmail.com> <1348068090-31988-3-git-send-email-florian.achleitner.2.6.31@gmail.com> <1348068090-31988-4-git-send-email-florian.achleitner.2.6.31@gmail.com> <1348068090-31988-5-git-send-email-florian.achleitner.2.6.31@gmail.com> <1348068090-31988-6-git-send-email-florian.achleitner.2.6.31@gmail.com> <1348068090-31988-7-git-send-email-florian.achleitner.2.6.31@gmail.com> <1348068090-31988-8-git-send-email-florian.achleitner.2.6.31@gmail.com> Cc: David Michael Barr , Jonathan Nieder , Junio C Hamano , Florian Achleitner To: GIT Mailing-list X-From: git-owner@vger.kernel.org Wed Sep 19 17:23:31 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TEM7f-0006Jl-52 for gcvg-git-2@plane.gmane.org; Wed, 19 Sep 2012 17:23:31 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755992Ab2ISPWp (ORCPT ); Wed, 19 Sep 2012 11:22:45 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:64575 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754984Ab2ISPWm (ORCPT ); Wed, 19 Sep 2012 11:22:42 -0400 Received: by mail-bk0-f46.google.com with SMTP id j10so596995bkw.19 for ; Wed, 19 Sep 2012 08:22:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=3ZamA3pBU1jBOWmjHwBXFG3gCzequgwyb4qKXdIUHlc=; b=Gqi29azw3eIDS8p/2MniMmAVIIMMHIMslp4wlooBAcZwVYkTA+lYkvT9dn0ZnT6xyR wT6IujZnhFF1ZkkgBpejKUzwjCtPF+yrzxRdZDucsE6na0Xc96dng6Y8v0Czks4zeHZg RaMDeCxI/D/I7QzcCHK4Xwp3Md+LzwDRU/b+7IuyRPIZ5AQQpFrIzcWXr4pR0/BxncYv ND7sM5cC/3WeebJe2QkDfp3fO2boL5BqEmAfRX75yJrlkRdJgL5BYH2p+HAJ9NsmLjlX hNF+YetCaz5xekcjs/vZnDm6SHXRUU5FWk1kv25TSUieEn0LyoKm53SNKq009js+VyRt Yycg== Received: by 10.204.0.80 with SMTP id 16mr1434024bka.71.1348068161862; Wed, 19 Sep 2012 08:22:41 -0700 (PDT) Received: from flobuntu.lan (91-115-94-56.adsl.highway.telekom.at. [91.115.94.56]) by mx.google.com with ESMTPS id d13sm1570686bkw.12.2012.09.19.08.22.37 (version=SSLv3 cipher=OTHER); Wed, 19 Sep 2012 08:22:38 -0700 (PDT) X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348068090-31988-8-git-send-email-florian.achleitner.2.6.31@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 Signed-off-by: Junio C Hamano --- diff: - remove glitch in function declaration. contrib/svn-fe/svn-fe.c | 2 +- test-svn-fe.c | 2 +- vcs-svn/fast_export.c | 4 ++-- vcs-svn/fast_export.h | 2 +- vcs-svn/svndump.c | 12 ++++++------ vcs-svn/svndump.h | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/svn-fe/svn-fe.c b/contrib/svn-fe/svn-fe.c index 35db24f..c796cc0 100644 --- a/contrib/svn-fe/svn-fe.c +++ b/contrib/svn-fe/svn-fe.c @@ -10,7 +10,7 @@ int main(int argc, char **argv) { if (svndump_init(NULL)) return 1; - svndump_read((argc > 1) ? argv[1] : NULL); + svndump_read((argc > 1) ? argv[1] : NULL, "refs/heads/master"); svndump_deinit(); svndump_reset(); return 0; diff --git a/test-svn-fe.c b/test-svn-fe.c index 83633a2..cb0d80f 100644 --- a/test-svn-fe.c +++ b/test-svn-fe.c @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) if (argc == 2) { if (svndump_init(argv[1])) return 1; - svndump_read(NULL); + svndump_read(NULL, "refs/heads/master"); svndump_deinit(); svndump_reset(); return 0; diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c index 1f04697..11f8f94 100644 --- a/vcs-svn/fast_export.c +++ b/vcs-svn/fast_export.c @@ -72,7 +72,7 @@ static char gitsvnline[MAX_GITSVN_LINE_LEN]; void fast_export_begin_commit(uint32_t revision, const char *author, const struct strbuf *log, const char *uuid, const char *url, - unsigned long timestamp) + unsigned long timestamp, const char *local_ref) { static const struct strbuf empty = STRBUF_INIT; if (!log) @@ -84,7 +84,7 @@ void fast_export_begin_commit(uint32_t revision, const char *author, } else { *gitsvnline = '\0'; } - printf("commit refs/heads/master\n"); + printf("commit %s\n", local_ref); printf("mark :%"PRIu32"\n", revision); printf("committer %s <%s@%s> %ld +0000\n", *author ? author : "nobody", diff --git a/vcs-svn/fast_export.h b/vcs-svn/fast_export.h index 8823aca..17eb13b 100644 --- a/vcs-svn/fast_export.h +++ b/vcs-svn/fast_export.h @@ -11,7 +11,7 @@ void fast_export_delete(const char *path); void fast_export_modify(const char *path, uint32_t mode, const char *dataref); void fast_export_begin_commit(uint32_t revision, const char *author, const struct strbuf *log, const char *uuid, - const char *url, unsigned long timestamp); + const char *url, unsigned long timestamp, const char *local_ref); void fast_export_end_commit(uint32_t revision); void fast_export_data(uint32_t mode, off_t len, struct line_buffer *input); void fast_export_blob_delta(uint32_t mode, diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c index d81a078..c8a5b7e 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(); } diff --git a/vcs-svn/svndump.h b/vcs-svn/svndump.h index acb5b47..febeecb 100644 --- a/vcs-svn/svndump.h +++ b/vcs-svn/svndump.h @@ -3,7 +3,7 @@ int svndump_init(const char *filename); int svndump_init_fd(int in_fd, int back_fd); -void svndump_read(const char *url); +void svndump_read(const char *url, const char *local_ref); void svndump_deinit(void); void svndump_reset(void); -- 1.7.9.5