From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Achleitner Subject: [PATCH v8 11/16] Create a note for every imported commit containing svn metadata Date: Wed, 19 Sep 2012 17:21:25 +0200 Message-ID: <1348068090-31988-12-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> <1348068090-31988-9-git-send-email-florian.achleitner.2.6.31@gmail.com> <1348068090-31988-10-git-send-email-florian.achleitner.2.6.31@gmail.com> <1348068090-31988-11-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:32 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 1TEM7g-0006Jl-BP for gcvg-git-2@plane.gmane.org; Wed, 19 Sep 2012 17:23:32 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932102Ab2ISPW4 (ORCPT ); Wed, 19 Sep 2012 11:22:56 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:32832 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755549Ab2ISPWx (ORCPT ); Wed, 19 Sep 2012 11:22:53 -0400 Received: by mail-bk0-f46.google.com with SMTP id j10so597401bkw.19 for ; Wed, 19 Sep 2012 08:22:52 -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=p9bhxbUIVfQc9DorHeb6jOGO84//0mt4RX9mVlHBfR4=; b=F1W8QS8N4WsRiXEusQeFWphdaAQGg4lL8fPEaNF2MeJl3J/5hB6ugTzZnGMqusfdGF yFb5oL+YGjPJbcD4LAJxRnJ/nOl574xsuMnBBm1Yq8KkVd3z+PfMa5/llBL/QlzezLhN g7DoDIPQoZ9nkoRbyrq8IQNOiKiKBoglgEr1QvsoELeCNJRTvw2Gjoctpe2NBXXOH7n4 Ssi2rkfaZ6Eq2cqszk4jtyMOJXI8eZJ5gbr/H1H0xug8x3bptVLG7KCF6VcXvaiG3wbL ZNl/0dH/Pjgkkpaf4RcPuszyA5tjPhUqqT9CKaM5ZVaIZk2oTe08hrOca+e0cai39Ezt q1sA== Received: by 10.204.152.137 with SMTP id g9mr1441829bkw.106.1348068172871; Wed, 19 Sep 2012 08:22:52 -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.50 (version=SSLv3 cipher=OTHER); Wed, 19 Sep 2012 08:22:52 -0700 (PDT) X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348068090-31988-11-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: To provide metadata from svn dumps for further processing, e.g. branch detection, attach a note to each imported commit that stores additional information. The notes are currently hard-coded in refs/notes/svn/revs. Currently the following lines from the svn dump are directly accumulated in the note. This can be refined as needed. - "Revision-number" - "Node-path" - "Node-kind" - "Node-action" - "Node-copyfrom-path" - "Node-copyfrom-rev" Signed-off-by: Florian Achleitner Signed-off-by: Junio C Hamano --- vcs-svn/fast_export.c | 14 ++++++++++++-- vcs-svn/fast_export.h | 2 ++ vcs-svn/svndump.c | 21 +++++++++++++++++++-- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c index 1ecae4b..df51c59 100644 --- a/vcs-svn/fast_export.c +++ b/vcs-svn/fast_export.c @@ -3,8 +3,7 @@ * See LICENSE for details. */ -#include "git-compat-util.h" -#include "strbuf.h" +#include "cache.h" #include "quote.h" #include "fast_export.h" #include "repo_tree.h" @@ -68,6 +67,17 @@ void fast_export_modify(const char *path, uint32_t mode, const char *dataref) putchar('\n'); } +void fast_export_begin_note(uint32_t revision, const char *author, + const char *log, unsigned long timestamp) +{ + size_t loglen = strlen(log); + printf("commit refs/notes/svn/revs\n"); + printf("committer %s <%s@%s> %ld +0000\n", author, author, "local", timestamp); + printf("data %"PRIuMAX"\n", (uintmax_t)loglen); + fwrite(log, loglen, 1, stdout); + fputc('\n', stdout); +} + void fast_export_note(const char *committish, const char *dataref) { printf("N %s %s\n", dataref, committish); diff --git a/vcs-svn/fast_export.h b/vcs-svn/fast_export.h index 9b32f1e..c2f6f11 100644 --- a/vcs-svn/fast_export.h +++ b/vcs-svn/fast_export.h @@ -10,6 +10,8 @@ void fast_export_deinit(void); void fast_export_delete(const char *path); void fast_export_modify(const char *path, uint32_t mode, const char *dataref); void fast_export_note(const char *committish, const char *dataref); +void fast_export_begin_note(uint32_t revision, const char *author, + const char *log, unsigned long timestamp); 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 *local_ref); diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c index c8a5b7e..7ec1a5b 100644 --- a/vcs-svn/svndump.c +++ b/vcs-svn/svndump.c @@ -48,7 +48,7 @@ static struct { static struct { uint32_t revision; unsigned long timestamp; - struct strbuf log, author; + struct strbuf log, author, note; } rev_ctx; static struct { @@ -77,6 +77,7 @@ static void reset_rev_ctx(uint32_t revision) rev_ctx.timestamp = 0; strbuf_reset(&rev_ctx.log); strbuf_reset(&rev_ctx.author); + strbuf_reset(&rev_ctx.note); } static void reset_dump_ctx(const char *url) @@ -310,8 +311,15 @@ static void begin_revision(const char *remote_ref) static void end_revision(void) { - if (rev_ctx.revision) + struct strbuf mark = STRBUF_INIT; + if (rev_ctx.revision) { fast_export_end_commit(rev_ctx.revision); + fast_export_begin_note(rev_ctx.revision, "remote-svn", + "Note created by remote-svn.", rev_ctx.timestamp); + strbuf_addf(&mark, ":%"PRIu32, rev_ctx.revision); + fast_export_note(mark.buf, "inline"); + fast_export_buf_to_data(&rev_ctx.note); + } } void svndump_read(const char *url, const char *local_ref) @@ -358,6 +366,7 @@ void svndump_read(const char *url, const char *local_ref) end_revision(); active_ctx = REV_CTX; reset_rev_ctx(atoi(val)); + strbuf_addf(&rev_ctx.note, "%s\n", t); break; case sizeof("Node-path"): if (constcmp(t, "Node-")) @@ -369,10 +378,12 @@ void svndump_read(const char *url, const char *local_ref) begin_revision(local_ref); active_ctx = NODE_CTX; reset_node_ctx(val); + strbuf_addf(&rev_ctx.note, "%s\n", t); break; } if (constcmp(t + strlen("Node-"), "kind")) continue; + strbuf_addf(&rev_ctx.note, "%s\n", t); if (!strcmp(val, "dir")) node_ctx.type = REPO_MODE_DIR; else if (!strcmp(val, "file")) @@ -383,6 +394,7 @@ void svndump_read(const char *url, const char *local_ref) case sizeof("Node-action"): if (constcmp(t, "Node-action")) continue; + strbuf_addf(&rev_ctx.note, "%s\n", t); if (!strcmp(val, "delete")) { node_ctx.action = NODEACT_DELETE; } else if (!strcmp(val, "add")) { @@ -401,11 +413,13 @@ void svndump_read(const char *url, const char *local_ref) continue; strbuf_reset(&node_ctx.src); strbuf_addstr(&node_ctx.src, val); + strbuf_addf(&rev_ctx.note, "%s\n", t); break; case sizeof("Node-copyfrom-rev"): if (constcmp(t, "Node-copyfrom-rev")) continue; node_ctx.srcRev = atoi(val); + strbuf_addf(&rev_ctx.note, "%s\n", t); break; case sizeof("Text-content-length"): if (constcmp(t, "Text") && constcmp(t, "Prop")) @@ -475,6 +489,7 @@ static void init(int report_fd) strbuf_init(&dump_ctx.url, 4096); strbuf_init(&rev_ctx.log, 4096); strbuf_init(&rev_ctx.author, 4096); + strbuf_init(&rev_ctx.note, 4096); strbuf_init(&node_ctx.src, 4096); strbuf_init(&node_ctx.dst, 4096); reset_dump_ctx(NULL); @@ -506,6 +521,8 @@ void svndump_deinit(void) reset_rev_ctx(0); reset_node_ctx(NULL); strbuf_release(&rev_ctx.log); + strbuf_release(&rev_ctx.author); + strbuf_release(&rev_ctx.note); strbuf_release(&node_ctx.src); strbuf_release(&node_ctx.dst); if (buffer_deinit(&input)) -- 1.7.9.5