From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Achleitner Subject: [PATCH/RFC v3 09/16] vcs-svn: add fast_export_note to create notes Date: Tue, 14 Aug 2012 21:13:11 +0200 Message-ID: <1344971598-8213-10-git-send-email-florian.achleitner.2.6.31@gmail.com> References: <1344971598-8213-1-git-send-email-florian.achleitner.2.6.31@gmail.com> <1344971598-8213-2-git-send-email-florian.achleitner.2.6.31@gmail.com> <1344971598-8213-3-git-send-email-florian.achleitner.2.6.31@gmail.com> <1344971598-8213-4-git-send-email-florian.achleitner.2.6.31@gmail.com> <1344971598-8213-5-git-send-email-florian.achleitner.2.6.31@gmail.com> <1344971598-8213-6-git-send-email-florian.achleitner.2.6.31@gmail.com> <1344971598-8213-7-git-send-email-florian.achleitner.2.6.31@gmail.com> <1344971598-8213-8-git-send-email-florian.achleitner.2.6.31@gmail.com> <1344971598-8213-9-git-send-email-florian.achleitner.2.6.31@gmail.com> Cc: florian.achleitner.2.6.31@gmail.com, Dmitry Ivankov To: git@vger.kernel.org, David Michael Barr , Jonathan Nieder X-From: git-owner@vger.kernel.org Tue Aug 14 21:17:37 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 1T1McL-0003cZ-JU for gcvg-git-2@plane.gmane.org; Tue, 14 Aug 2012 21:17:29 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756674Ab2HNTRY (ORCPT ); Tue, 14 Aug 2012 15:17:24 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:44490 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756588Ab2HNTRW (ORCPT ); Tue, 14 Aug 2012 15:17:22 -0400 Received: by mail-bk0-f46.google.com with SMTP id j10so265503bkw.19 for ; Tue, 14 Aug 2012 12:17:21 -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=vAFOST64AB6xXkSpJ33xknC9dc3y1wRiGEdbAtdkQR0=; b=skeXw26IdTCFHIjRoJuCZH8nSblnIAJ0J1vV6q3WMnLSJaUViW1e56YALu9PhJ4vZ9 B2gNFtCuh23uBB6syRlmnyl8x02JvhkV2ztqTAMOZDqF9KFzqDG3HCK/1jduW6yNgjjq tu64J+pR/7RbIAzpF1BCNda+wDmiTxaw3nJWJglJBOh62KvOQuZWHJj++PxNii/ypNqV yzjBEjjPdt3cRZOAd3opJp5zinQOzGAO56adItZF/wowHMM8Q0OsmQQ5yQGKzNW4l/4Z fh++ohTJNuripQ9b2SgDZT65puctoct2I90dmCTZxVWxEiPPH7a66zyB8XK41YXJhmCh OQaQ== Received: by 10.204.13.82 with SMTP id b18mr6909754bka.118.1344971841491; Tue, 14 Aug 2012 12:17:21 -0700 (PDT) Received: from localhost.localdomain (089144206125.atnat0015.highway.a1.net. [89.144.206.125]) by mx.google.com with ESMTPS id fu8sm1681583bkc.5.2012.08.14.12.17.17 (version=SSLv3 cipher=OTHER); Tue, 14 Aug 2012 12:17:20 -0700 (PDT) X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344971598-8213-9-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 --- 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