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.
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@xxxxxxxxx>
---
contrib/svn-fe/remote-svn.c | 78 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 77 insertions(+), 1 deletion(-)
diff --git a/contrib/svn-fe/remote-svn.c b/contrib/svn-fe/remote-svn.c
index f23b82f..054433b 100644
--- a/contrib/svn-fe/remote-svn.c
+++ b/contrib/svn-fe/remote-svn.c
@@ -27,7 +27,7 @@ static const char *url;
static int dump_from_file;
static const char *private_ref;
static const char *remote_ref = "refs/heads/master";
-static const char *notes_ref;
+static const char *notes_ref, *marksfilename;
struct rev_note { unsigned int rev_nr; };
/*
@@ -97,6 +97,75 @@ static int parse_rev_note(const char *msg, struct rev_note *res) {
return 0;
}
+static int note2mark_cb(const unsigned char *object_sha1,
+ const unsigned char *note_sha1, char *note_path,
+ void *cb_data) {
+ FILE *file = (FILE *)cb_data;
+ char *msg;
+ unsigned long msglen;
+ enum object_type type;
+ struct rev_note note;
+ if (!(msg = read_sha1_file(note_sha1, &type, &msglen)) ||
+ !msglen || type != OBJ_BLOB) {
+ free(msg);
+ return 1;
+ }
+ if (parse_rev_note(msg, ¬e))
+ return 2;
+ if (fprintf(file, ":%d %s\n", note.rev_nr, sha1_to_hex(object_sha1)) < 1)
+ return 3;
+ return 0;
+}
+
+static void regenerate_marks() {
+ int ret;
+ FILE *marksfile;
+ marksfile = fopen(marksfilename, "w+");
+ if (!marksfile)
+ die_errno("Couldn't create mark file %s.", marksfilename);
+ ret = for_each_note(NULL, 0, note2mark_cb, marksfile);
+ if (ret)
+ die("Regeneration of marks failed, returned %d.", ret);
+ fclose(marksfile);
+}
+
+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;
+
+ printd("checking marks file %s.", marksfilename);
+ init_notes(NULL, notes_ref, NULL, 0);
+ marksfile = fopen(marksfilename, "r");
+ if (!marksfile) {
+ printd("no marks found, regenerate.");
+ regenerate_marks(marksfile);
+ }
+ else {
+ strbuf_addf(&sb, ":%d ", latestrev);
+ while (getline(&line, &linelen, marksfile) != -1) {
+ if (!prefixcmp(line, sb.buf)) {
+ found++;
+ break;
+ }
+ }
+ fclose(marksfile);
+ if (!found) {
+ printd("marks found but doesn't contain highest rev, regenerate.");
+ regenerate_marks();
+ }
+ else
+ printd("marks found and ok.");
+ }
+ free_notes(NULL);
+ strbuf_release(&sb);
+}
+
enum cmd_result cmd_import(struct strbuf *line)
{
static int batch_active;
@@ -168,6 +237,8 @@ enum cmd_result cmd_import(struct strbuf *line)
}
}
+ check_or_regenerate_marks(startrev - 1);
+
printd("starting import from revision %u", startrev);
if(dump_from_file) {
@@ -288,6 +359,10 @@ int main(int argc, const char **argv)
strbuf_addf(&buf, "refs/notes/%s/revs", remote->name);
notes_ref = strbuf_detach(&buf, NULL);
+ strbuf_init(&buf, 0);
+ strbuf_addf(&buf, "%s/info/fast-import/marks/%s", get_git_dir(), remote->name);
+ marksfilename = strbuf_detach(&buf, NULL);
+
while(1) {
if (strbuf_getline(&buf, stdin, '\n') == EOF) {
if (ferror(stdin))
@@ -304,5 +379,6 @@ int main(int argc, const char **argv)
free((void*)url);
free((void*)private_ref);
free((void*)notes_ref);
+ free((void*)marksfilename);
return 0;
}
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html