From: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
To: git@vger.kernel.org, David Michael Barr <davidbarr@google.com>,
Jonathan Nieder <jrnieder@gmail.com>
Cc: florian.achleitner.2.6.31@gmail.com
Subject: [PATCH/RFC v3 14/16] transport-helper: add import|export-marks to fast-import command line.
Date: Tue, 14 Aug 2012 21:13:16 +0200 [thread overview]
Message-ID: <1344971598-8213-15-git-send-email-florian.achleitner.2.6.31@gmail.com> (raw)
In-Reply-To: <1344971598-8213-14-git-send-email-florian.achleitner.2.6.31@gmail.com>
fast-import internally uses marks that refer to an object via its sha1.
Those marks are created during import to find previously created objects.
At exit the accumulated marks can be exported to a file and reloaded at
startup, so that the previous marks are available.
Add command line options to the fast-import command line to enable this.
The mark files are stored in info/fast-import/marks/<remote-name>.
Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
---
transport-helper.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/transport-helper.c b/transport-helper.c
index 7fb52d4..47db055 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -387,6 +387,9 @@ static int get_importer(struct transport *transport, struct child_process *fasti
fastimport->in = helper->out;
argv_array_push(&argv, "fast-import");
argv_array_push(&argv, debug ? "--stats" : "--quiet");
+ argv_array_push(&argv, "--relative-marks");
+ argv_array_pushf(&argv, "--import-marks-if-exists=marks/%s", transport->remote->name);
+ argv_array_pushf(&argv, "--export-marks=marks/%s", transport->remote->name);
if (data->bidi_import) {
cat_blob_fd = xdup(helper->in);
--
1.7.9.5
next prev parent reply other threads:[~2012-08-14 19:18 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-14 19:13 [PATCH/RFC v3 00/16] GSOC remote-svn Florian Achleitner
2012-08-14 19:13 ` [PATCH/RFC v3 01/16] Implement a remote helper for svn in C Florian Achleitner
2012-08-14 19:13 ` [PATCH/RFC v3 02/16] Integrate remote-svn into svn-fe/Makefile Florian Achleitner
2012-08-14 19:13 ` [PATCH/RFC v3 03/16] Add svndump_init_fd to allow reading dumps from arbitrary FDs Florian Achleitner
2012-08-14 19:13 ` [PATCH/RFC v3 04/16] Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability Florian Achleitner
2012-08-14 19:13 ` [PATCH/RFC v3 05/16] Add documentation for the 'bidi-import' capability of remote-helpers Florian Achleitner
2012-08-14 19:13 ` [PATCH/RFC v3 06/16] remote-svn, vcs-svn: Enable fetching to private refs Florian Achleitner
2012-08-14 19:13 ` [PATCH/RFC v3 07/16] Add a symlink 'git-remote-svn' in base dir Florian Achleitner
2012-08-14 19:13 ` [PATCH/RFC v3 08/16] Allow reading svn dumps from files via file:// urls Florian Achleitner
2012-08-14 19:13 ` [PATCH/RFC v3 09/16] vcs-svn: add fast_export_note to create notes Florian Achleitner
2012-08-14 19:13 ` [PATCH/RFC v3 10/16] Create a note for every imported commit containing svn metadata Florian Achleitner
2012-08-14 19:13 ` [PATCH/RFC v3 11/16] When debug==1, start fast-import with "--stats" instead of "--quiet" Florian Achleitner
2012-08-14 19:13 ` [PATCH/RFC v3 12/16] remote-svn: add incremental import Florian Achleitner
2012-08-14 19:13 ` [PATCH/RFC v3 13/16] Add a svnrdump-simulator replaying a dump file for testing Florian Achleitner
2012-08-14 19:13 ` Florian Achleitner [this message]
2012-08-14 19:13 ` [PATCH/RFC v3 15/16] remote-svn: add marks-file regeneration Florian Achleitner
2012-08-14 19:13 ` [PATCH/RFC v3 16/16] Add a test script for remote-svn Florian Achleitner
2012-08-15 11:46 ` Florian Achleitner
2012-08-15 19:52 ` [PATCH/RFC v3 14/16] transport-helper: add import|export-marks to fast-import command line Junio C Hamano
2012-08-15 20:20 ` Florian Achleitner
2012-08-15 21:06 ` Florian Achleitner
2012-08-15 19:50 ` [PATCH/RFC v3 11/16] When debug==1, start fast-import with "--stats" instead of "--quiet" Junio C Hamano
2012-08-15 19:49 ` [PATCH/RFC v3 10/16] Create a note for every imported commit containing svn metadata Junio C Hamano
2012-08-15 20:10 ` Florian Achleitner
2012-08-14 20:43 ` [PATCH/RFC v3 07/16] Add a symlink 'git-remote-svn' in base dir Junio C Hamano
2012-08-14 20:46 ` Junio C Hamano
2012-08-15 9:20 ` Florian Achleitner
2012-08-14 20:40 ` [PATCH/RFC v3 04/16] Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability Junio C Hamano
2012-08-15 12:00 ` Florian Achleitner
2012-08-15 17:41 ` Junio C Hamano
2012-08-14 20:15 ` [PATCH/RFC v3 03/16] Add svndump_init_fd to allow reading dumps from arbitrary FDs Junio C Hamano
2012-08-14 20:14 ` [PATCH/RFC v3 02/16] Integrate remote-svn into svn-fe/Makefile Junio C Hamano
2012-08-15 8:54 ` Florian Achleitner
2012-08-14 20:07 ` [PATCH/RFC v3 01/16] Implement a remote helper for svn in C Junio C Hamano
2012-08-15 12:00 ` Florian Achleitner
2012-08-14 23:59 ` [PATCH/RFC v3 00/16] GSOC remote-svn David Michael Barr
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=1344971598-8213-15-git-send-email-florian.achleitner.2.6.31@gmail.com \
--to=florian.achleitner.2.6.31@gmail.com \
--cc=davidbarr@google.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/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).