[PATCH 2/3] Teach fast-import to print the id of each imported commit
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Sep 5, 2010, 03:29 UTC
- Message-ID
- <20100905032957.GC2344@burratino>
- In-Reply-To
- <20100905031528.GA2344@burratino>
For the svn importer, it would be useful to build a map from subversion revision numbers to git commits as the import takes place. This is particularly relevant because the subversion api sometimes represents as "copy this directory from this revision", and the importer needs to be able to access the corresponding trees. So (optionally) print each commit id when the corresponding object is written.
Unfortunately when each commit object is written, it is not yet accessible to the caller until a checkpoint has finished. A later patch will teach fast-import to directly pass on the relevant data on request, using the same channel.
Cc: Shawn O. Pearce <spearce@spearce.org> Cc: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- I am not happy with the interface:
. the name --report-fd is a bit silly. Maybe next round will have a better one. . some frontends may want to use "cat" without the commit id noise . it is easy to trigger SIGPIPE by ignoring the last couple of commit ids . communication needs to be serialized. What will happen if a commit gets finished while a "cat" command is being fulfilled?
Documentation/git-fast-import.txt | 13 +++++++++++ fast-import.c | 18 +++++++++++++++ t/t9300-fast-import.sh | 42 +++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 966ba4f..e217635 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -92,6 +92,18 @@ OPTIONS --(no-)-relative-marks= with the --(import|export)-marks= options. +--report-fd=<fd>:: + Print the 40-character object name for each commit to + the specified file descriptor before writing it to the + pack. This information may be useful if the importer + needs to maintain a map from revisions in the source + repository to commit ids in the target repository + during the import. ++ +The described objects are not necessarily accessible +using standard git plumbing tools until a little while +after the next checkpoint. + --export-pack-edges=<file>:: After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last @@ -896,6 +908,7 @@ The following features are currently supported: * date-format * import-marks * export-marks +* report-fd * relative-marks * no-relative-marks * force diff --git a/fast-import.c b/fast-import.c index 2317b0f..ef0cee7 100644 --- a/fast-import.c +++ b/fast-import.c @@ -361,6 +361,9 @@ static uintmax_t next_mark; static struct strbuf new_data = STRBUF_INIT; static int seen_data_command; +/* Where to report commits */ +static int report_fd = -1; + static void parse_argv(void); static void write_branch_report(FILE *rpt, struct branch *b) @@ -2571,6 +2574,11 @@ static void parse_new_commit(void) if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark)) b->pack_id = pack_id; + if (report_fd != -1) { + char *buf = sha1_to_hex(b->sha1); + buf[40] = '\n'; + write_or_die(report_fd, buf, 41); + } b->last_commit = object_count_by_type[OBJ_COMMIT]; } @@ -2755,6 +2763,14 @@ static void option_export_marks(const char *marks) safe_create_leading_directories_const(export_marks_file); } +static void option_report_fd(const char *fd) +{ + unsigned long n = strtoul(fd, NULL, 0); + if (n > (unsigned long) INT_MAX) + die("--report-fd cannot exceed %d", INT_MAX); + report_fd = (int) n; +} + static void option_export_pack_edges(const char *edges) { if (pack_edges) @@ -2808,6 +2824,8 @@ static int parse_one_feature(const char *feature, int from_stream) option_import_marks(feature + 13, from_stream); } else if (!prefixcmp(feature, "export-marks=")) { option_export_marks(feature + 13); + } else if (!prefixcmp(feature, "report-fd=")) { + option_report_fd(feature + strlen("report-fd=")); } else if (!prefixcmp(feature, "relative-marks")) { relative_marks_paths = 1; } else if (!prefixcmp(feature, "no-relative-marks")) { diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 5c274e7..610e7a5 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -1663,6 +1663,48 @@ test_expect_success 'R: feature no-relative-marks is honoured' ' test_cmp marks.out non-relative.out ' +test_expect_success 'have pipes?' ' + test_when_finished "rm -f frob" && + if mkfifo frob + then + test_set_prereq PIPE + fi +' + +test_expect_success PIPE 'R: feature report-fd is honoured' ' + mkfifo commits && + test_when_finished "rm -f commits" && + cat >frontend <<-\FRONTEND_END && + #!/bin/sh + cat <<EOF && + feature report-fd=3 + commit refs/heads/printed + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <<COMMIT + to be printed + COMMIT + + from refs/heads/master + D file3 + + EOF + + read cid <&3 && + echo "$cid" >received + EOF + FRONTEND_END + chmod +x frontend && + ( + { + sh frontend 3<commits || + exit + } | + git fast-import 3>commits + ) && + git rev-parse --verify printed >real && + test_cmp real received +' + test_expect_success 'R: quiet option results in no stats being output' ' >empty && cat >input <<-\EOF &&
-- 1.7.2.3