From: "Joachim Schmitz" <jojo@schmitz-digital.de>
To: <florian.achleitner.2.6.31@gmail.com>
Cc: <git@vger.kernel.org>
Subject: Re: [PATCH v6 15/16] remote-svn: add marks-file regeneration
Date: Sat, 25 Aug 2012 17:55:13 +0200 [thread overview]
Message-ID: <001c01cd82da$03abbb00$0b033100$@schmitz-digital.de> (raw)
"Florian Achleitner" <florian.achleitner.2.6.31@gmail.com> schrieb im Newsbeitrag
news:<1345662961-9587-16-git-send-email-florian.achleitner.2.6.31@gmail.com>...
> fast-import mark files are stored outside the object database and are
> therefore not fetched and can be lost somehow else. marks provide a
> svn revision --> git sha1 mapping, while the notes that are attached
> to each commit when it is imported provide a git sha1 --> svn revision
> mapping.
>
> If the marks file is not available or not plausible, regenerate it by
> walking through the notes tree. , i.e. The plausibility check tests
> if the highest revision in the marks file matches the revision of the
> top ref. It doesn't ensure that the mark file is completely correct.
> This could only be done with an effort equal to unconditional
> regeneration.
>
> Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> remote-testsvn.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 68 insertions(+)
>
> diff --git a/remote-testsvn.c b/remote-testsvn.c
> index e90d221..09dc304 100644
> --- a/remote-testsvn.c
> +++ b/remote-testsvn.c
...
> +static void check_or_regenerate_marks(int latestrev) {
> + FILE *marksfile;
> + char *line = NULL;
> + size_t linelen = 0;
> + struct strbuf sb = STRBUF_INIT;
> + int found = 0;
> +
> + if (latestrev < 1)
> + return;
> +
> + init_notes(NULL, notes_ref, NULL, 0);
> + marksfile = fopen(marksfilename, "r");
> + if (!marksfile) {
> + regenerate_marks();
> + marksfile = fopen(marksfilename, "r");
> + if (!marksfile)
> + die_errno("cannot read marks file %s!", marksfilename);
> + fclose(marksfile);
> + } else {
> + strbuf_addf(&sb, ":%d ", latestrev);
> + while (getline(&line, &linelen, marksfile) != -1) {
getline() is not available to anybody, e.g. it is not in HP NonStop.
Bye, Jojo
next reply other threads:[~2012-08-25 15:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-25 15:55 Joachim Schmitz [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-08-25 18:55 [PATCH v6 15/16] remote-svn: add marks-file regeneration Joachim Schmitz
2012-08-22 19:15 [PATCH v6 01/16] GSOC remote-svn Florian Achleitner
2012-08-22 19:15 ` [PATCH v6 01/16] Implement a remote helper for svn in C Florian Achleitner
2012-08-22 19:15 ` [PATCH v6 02/16] Add git-remote-testsvn to Makefile Florian Achleitner
2012-08-22 19:15 ` [PATCH v6 03/16] Add svndump_init_fd to allow reading dumps from arbitrary FDs Florian Achleitner
2012-08-22 19:15 ` [PATCH v6 04/16] Add argv_array_detach and argv_array_free_detached Florian Achleitner
2012-08-22 19:15 ` [PATCH v6 05/16] Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability Florian Achleitner
2012-08-22 19:15 ` [PATCH v6 06/16] Add documentation for the 'bidi-import' capability of remote-helpers Florian Achleitner
2012-08-22 19:15 ` [PATCH v6 07/16] When debug==1, start fast-import with "--stats" instead of "--quiet" Florian Achleitner
2012-08-22 19:15 ` [PATCH v6 08/16] remote-svn, vcs-svn: Enable fetching to private refs Florian Achleitner
2012-08-22 19:15 ` [PATCH v6 09/16] Allow reading svn dumps from files via file:// urls Florian Achleitner
2012-08-22 19:15 ` [PATCH v6 10/16] vcs-svn: add fast_export_note to create notes Florian Achleitner
2012-08-22 19:15 ` [PATCH v6 11/16] Create a note for every imported commit containing svn metadata Florian Achleitner
2012-08-22 19:15 ` [PATCH v6 12/16] remote-svn: Activate import/export-marks for fast-import Florian Achleitner
2012-08-22 19:15 ` [PATCH v6 13/16] remote-svn: add incremental import Florian Achleitner
2012-08-22 19:15 ` [PATCH v6 14/16] Add a svnrdump-simulator replaying a dump file for testing Florian Achleitner
2012-08-22 19:16 ` [PATCH v6 15/16] remote-svn: add marks-file regeneration 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='001c01cd82da$03abbb00$0b033100$@schmitz-digital.de' \
--to=jojo@schmitz-digital.de \
--cc=florian.achleitner.2.6.31@gmail.com \
--cc=git@vger.kernel.org \
/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).