fast-import: introduce "feature notes" command

Here is a 'feature' command for streams to use to require support for the notemodify (N) command. When the 'feature' facility was introduced (v1.7.0-rc0~95^2~4, 2009-12-04), the notes import feature was old news (v1.6.6-rc0~21^2~8, 2009-10-09) and it was not obvious it deserved to be a named feature. But now that is clear, since all major non-git fast-import backends lack support for it. Details: on git version with this patch applied, any "feature notes" command in the features/options section at the beginning of a stream will be treated as a no-op. On fast-import implementations without the feature (and older git versions), the command instead errors out with a message like This version of fast-import does not support feature notes. So by declaring use of notes at the beginning of a stream, frontends can avoid wasting time and other resources when the backend does not support notes. (This would be especially important for backends that do not support rewinding history after a botched import.) Improved-by: Thomas Rast <trast@student.ethz.ch> Improved-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jonathan Nieder committed Feb 9, 2011 at 16:43 UTC 547e8b9205349b47003ed25a82673e413e71c255

3 files changed +9

Documentation/git-fast-import.txt

@@ -898,6 +898,12 @@ import-marks::

898 second, an --import-marks= command-line option overrides

899 any "feature import-marks" command in the stream.

900

901 +notes::

902 + Require that the backend support the 'notemodify' (N)

903 + subcommand to the 'commit' command.

904 + Versions of fast-import not supporting notes will exit

905 + with a message indicating so.

906 +

907 `option`

908 ~~~~~~~~

909 Processes the specified option so that git fast-import behaves in a

fast-import.c

@@ -2821,6 +2821,8 @@ static int parse_one_feature(const char *feature, int from_stream)

2821 relative_marks_paths = 0;

2822 } else if (!prefixcmp(feature, "force")) {

2823 force_update = 1;

2824 + } else if (!strcmp(feature, "notes")) {

2825 + ; /* do nothing; we have the feature */

2826 } else {

2827 return 0;

2828 }

t/t9301-fast-import-notes.sh

@@ -120,6 +120,7 @@ test_expect_success 'add notes with simple M command' '

120

121 test_tick

122 cat >input <<INPUT_END

123 +feature notes

124 commit refs/notes/test

125 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE

126 data <<COMMIT