Mike Hommey wrote:
> And while I'm here, it's sad that one needs to emit a dummy cat-blob or
> ls command to wait for a checkpoint to be finished
That's a good point. (Though relying on checkpoints to read back
information is an ugly trick, so if we can get other commands to
provide the information you need then that would be better.)
The old-fashioned way is to do "progress checkpoint done". Alas, that
writes to the progress fd, which doesn't go to the remote helper's
stdin. How about something like this?
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
diff --git i/Documentation/git-fast-import.txt w/Documentation/git-fast-import.txt
index 377eeaa..c0dedac 100644
--- i/Documentation/git-fast-import.txt
+++ w/Documentation/git-fast-import.txt
@@ -1055,6 +1055,12 @@ ls::
rather than wasting time on the early part of an import
before the unsupported command is detected.
+notify-on-checkpoint::
+ Cause the backend to write `checkpoint complete` to the file
+ descriptor set with `--cat-blob-fd`, or to `stdout` if
+ `--cat-blob-fd` was unspecified, when finishing a checkpoint
+ requested via a `checkpoint` command or SIGUSR1.
+
notes::
Require that the backend support the 'notemodify' (N)
subcommand to the 'commit' command.
diff --git i/fast-import.c w/fast-import.c
index d0bd285..ccf4768 100644
--- i/fast-import.c
+++ w/fast-import.c
@@ -329,6 +329,7 @@ static const char *import_marks_file;
static int import_marks_file_from_stream;
static int import_marks_file_ignore_missing;
static int relative_marks_paths;
+static int notify_on_checkpoint;
/* Our last blob */
static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
@@ -3094,6 +3095,9 @@ static void checkpoint(void)
dump_tags();
dump_marks();
}
+ if (notify_on_checkpoint)
+ cat_blob_write("checkpoint complete\n",
+ strlen("checkpoint complete\n"));
}
static void parse_checkpoint(void)
@@ -3244,6 +3248,8 @@ static int parse_one_feature(const char *feature, int from_stream)
option_export_marks(arg);
} else if (!strcmp(feature, "cat-blob")) {
; /* Don't die - this feature is supported */
+ } else if (!strcmp(feature, "notify-on-checkpoint")) {
+ notify_on_checkpoint = 1;
} else if (!strcmp(feature, "relative-marks")) {
relative_marks_paths = 1;
} else if (!strcmp(feature, "no-relative-marks")) {
--
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