From: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
To: GIT Mailing-list <git@vger.kernel.org>
Cc: "David Michael Barr" <b@rr-dav.id.au>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Ramsay Jones" <ramsay@ramsay1.demon.co.uk>,
"Torsten Bögershausen" <tboegi@web.de>,
"Joachim Schmitz" <jojo@schmitz-digital.de>,
"Erik Faye-Lund" <kusmabite@gmail.com>,
"Dmitry Ivankov" <divanorama@gmail.com>,
"Florian Achleitner" <florian.achleitner.2.6.31@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH v7 10/16] vcs-svn: add fast_export_note to create notes
Date: Tue, 28 Aug 2012 10:49:44 +0200 [thread overview]
Message-ID: <1346143790-23491-11-git-send-email-florian.achleitner.2.6.31@gmail.com> (raw)
In-Reply-To: <1346143790-23491-10-git-send-email-florian.achleitner.2.6.31@gmail.com>
From: Dmitry Ivankov <divanorama@gmail.com>
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 <divanorama@gmail.com>
Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
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
next prev parent reply other threads:[~2012-08-28 8:51 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-28 8:49 [PATCH v7 00/16] GSOC remote-svn Florian Achleitner
2012-08-28 8:49 ` [PATCH v7 01/16] Implement a remote helper for svn in C Florian Achleitner
2012-08-28 8:49 ` [PATCH v7 02/16] Add git-remote-testsvn to Makefile Florian Achleitner
2012-08-28 8:49 ` [PATCH v7 03/16] Add svndump_init_fd to allow reading dumps from arbitrary FDs Florian Achleitner
2012-08-28 8:49 ` [PATCH v7 04/16] Add argv_array_detach and argv_array_free_detached Florian Achleitner
2012-08-28 8:49 ` [PATCH v7 05/16] Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability Florian Achleitner
2012-08-28 8:49 ` [PATCH v7 06/16] Add documentation for the 'bidi-import' capability of remote-helpers Florian Achleitner
2012-08-28 8:49 ` [PATCH v7 07/16] When debug==1, start fast-import with "--stats" instead of "--quiet" Florian Achleitner
2012-08-28 8:49 ` [PATCH v7 08/16] remote-svn, vcs-svn: Enable fetching to private refs Florian Achleitner
2012-08-28 8:49 ` [PATCH v7 09/16] Allow reading svn dumps from files via file:// urls Florian Achleitner
2012-08-28 8:49 ` Florian Achleitner [this message]
2012-08-28 8:49 ` [PATCH v7 11/16] Create a note for every imported commit containing svn metadata Florian Achleitner
2012-08-28 8:49 ` [PATCH v7 12/16] remote-svn: Activate import/export-marks for fast-import Florian Achleitner
2012-08-28 8:49 ` [PATCH v7 13/16] remote-svn: add incremental import Florian Achleitner
2012-08-28 8:49 ` [PATCH v7 14/16] Add a svnrdump-simulator replaying a dump file for testing Florian Achleitner
2012-08-28 8:49 ` [PATCH v7 15/16] remote-svn: add marks-file regeneration Florian Achleitner
2012-08-28 8:49 ` [PATCH v7 16/16] Add a test script for remote-svn Florian Achleitner
2012-08-28 18:01 ` Junio C Hamano
2012-08-28 17:59 ` [PATCH v7 15/16] remote-svn: add marks-file regeneration Junio C Hamano
2012-08-28 17:54 ` [PATCH v7 13/16] remote-svn: add incremental import Junio C Hamano
2012-08-28 17:06 ` [PATCH v7 09/16] Allow reading svn dumps from files via file:// urls Junio C Hamano
2012-08-28 17:53 ` [PATCH v7 08/16] remote-svn, vcs-svn: Enable fetching to private refs Junio C Hamano
2012-08-28 17:02 ` [PATCH v7 03/16] Add svndump_init_fd to allow reading dumps from arbitrary FDs Junio C Hamano
2012-08-28 16:55 ` [PATCH v7 02/16] Add git-remote-testsvn to Makefile Junio C Hamano
2012-08-28 17:08 ` [PATCH v7 01/16] Implement a remote helper for svn in C Junio C Hamano
2012-08-28 8:59 ` [PATCH v7 00/16] GSOC remote-svn Florian Achleitner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346143790-23491-11-git-send-email-florian.achleitner.2.6.31@gmail.com \
--to=florian.achleitner.2.6.31@gmail.com \
--cc=b@rr-dav.id.au \
--cc=divanorama@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jojo@schmitz-digital.de \
--cc=jrnieder@gmail.com \
--cc=kusmabite@gmail.com \
--cc=ramsay@ramsay1.demon.co.uk \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).