From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Achleitner Subject: [PATCH v7 10/16] vcs-svn: add fast_export_note to create notes Date: Tue, 28 Aug 2012 10:49:44 +0200 Message-ID: <1346143790-23491-11-git-send-email-florian.achleitner.2.6.31@gmail.com> References: <1346143790-23491-1-git-send-email-florian.achleitner.2.6.31@gmail.com> <1346143790-23491-2-git-send-email-florian.achleitner.2.6.31@gmail.com> <1346143790-23491-3-git-send-email-florian.achleitner.2.6.31@gmail.com> <1346143790-23491-4-git-send-email-florian.achleitner.2.6.31@gmail.com> <1346143790-23491-5-git-send-email-florian.achleitner.2.6.31@gmail.com> <1346143790-23491-6-git-send-email-florian.achleitner.2.6.31@gmail.com> <1346143790-23491-7-git-send-email-florian.achleitner.2.6.31@gmail.com> <1346143790-23491-8-git-send-email-florian.achleitner.2.6.31@gmail.com> <1346143790-23491-9-git-send-email-florian.achleitner.2.6.31@gmail.com> <1346143790-23491-10-git-send-email-florian.achleitner.2.6.31@gmail.com> Cc: David Michael Barr , Jonathan Nieder , Ramsay Jones , =?UTF-8?q?Torsten=20B=C3=B6gershausen?= , Joachim Schmitz , Erik Faye-Lund , Dmitry Ivankov , Florian Achleitner , Junio C Hamano To: GIT Mailing-list X-From: git-owner@vger.kernel.org Tue Aug 28 10:51:38 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 1T6HWL-00022f-LE for gcvg-git-2@plane.gmane.org; Tue, 28 Aug 2012 10:51:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752008Ab2H1IvW (ORCPT ); Tue, 28 Aug 2012 04:51:22 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:51578 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751898Ab2H1IvV (ORCPT ); Tue, 28 Aug 2012 04:51:21 -0400 Received: by mail-bk0-f46.google.com with SMTP id j10so1533185bkw.19 for ; Tue, 28 Aug 2012 01:51:20 -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=b5rwxbmDnvjj9sM2k/++fnhbF1D0Yv6mpB3mzeQMoa4=; b=EaBAbmm1JEAGsPXYCl2m+WomuReri/HWNXpbPXLL9K+Bw75r006uSY1089N+KDPHeo DQZT0VuQNqu2VRX3V0wxeBm1JJzd6Wi1/q+YAgH+5KE1SadViO8MKydu0PBMY9xLlKTT rM79+JQ4lMfbyDiXmLGHFl9B5mVKoPvmXCjDe4b/gO4x9uIrRn41I0uHQh+yGHj0dRNq 0tMhwMtGUgmZE/QyakxtzoGGPREHuRp5/vuFf4Rh1cIR2JosaPYu4gWx/4jfHt2zPER1 keK6jKWA5DwmDe0XOPSsXHrxXkSFTrb/sEiB0WTtLUKCwhy9IwvJXgi02vOGSYsMW0di kWuQ== Received: by 10.204.136.215 with SMTP id s23mr4527476bkt.32.1346143880580; Tue, 28 Aug 2012 01:51:20 -0700 (PDT) Received: from flobuntu.lan (91-115-85-203.adsl.highway.telekom.at. [91.115.85.203]) by mx.google.com with ESMTPS id m9sm12047800bkm.10.2012.08.28.01.51.17 (version=SSLv3 cipher=OTHER); Tue, 28 Aug 2012 01:51:19 -0700 (PDT) X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346143790-23491-10-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: From: Dmitry Ivankov fast_export lacked a method to writes notes to fast-import stream. Add two new functions fast_export_note which is similar to fast_export_modify. And also add fast_export_buf_to_data to be able to write inline blobs that don't come from a line_buffer or from delta application. To be used like this: fast_export_begin_commit("refs/notes/somenotes", ...) fast_export_note("refs/heads/master", "inline") fast_export_buf_to_data(&data) or maybe fast_export_note("refs/heads/master", sha1) Signed-off-by: Dmitry Ivankov Signed-off-by: Florian Achleitner Signed-off-by: Junio C Hamano --- vcs-svn/fast_export.c | 12 ++++++++++++ vcs-svn/fast_export.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c index 11f8f94..1ecae4b 100644 --- a/vcs-svn/fast_export.c +++ b/vcs-svn/fast_export.c @@ -68,6 +68,11 @@ void fast_export_modify(const char *path, uint32_t mode, const char *dataref) putchar('\n'); } +void fast_export_note(const char *committish, const char *dataref) +{ + printf("N %s %s\n", dataref, committish); +} + static char gitsvnline[MAX_GITSVN_LINE_LEN]; void fast_export_begin_commit(uint32_t revision, const char *author, const struct strbuf *log, @@ -222,6 +227,13 @@ static long apply_delta(off_t len, struct line_buffer *input, return ret; } +void fast_export_buf_to_data(const struct strbuf *data) +{ + printf("data %"PRIuMAX"\n", (uintmax_t)data->len); + fwrite(data->buf, data->len, 1, stdout); + fputc('\n', stdout); +} + void fast_export_data(uint32_t mode, off_t len, struct line_buffer *input) { assert(len >= 0); diff --git a/vcs-svn/fast_export.h b/vcs-svn/fast_export.h index 17eb13b..9b32f1e 100644 --- a/vcs-svn/fast_export.h +++ b/vcs-svn/fast_export.h @@ -9,11 +9,13 @@ 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_commit(uint32_t revision, const char *author, const struct strbuf *log, const char *uuid, 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_buf_to_data(const struct strbuf *data); void fast_export_blob_delta(uint32_t mode, uint32_t old_mode, const char *old_data, off_t len, struct line_buffer *input); -- 1.7.9.5