From: Jonathan Nieder <jrnieder@gmail.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: git@vger.kernel.org, "Shawn O. Pearce" <spearce@spearce.org>,
Sverre Rabbelier <srabbelier@gmail.com>,
David Barr <david.barr@cordelta.com>, Sam Vilain <sam@vilain.net>
Subject: [PATCH 6/3] fast-import: Allow cat requests at arbitrary points in stream
Date: Tue, 7 Sep 2010 22:27:37 -0500 [thread overview]
Message-ID: <20100908032736.GC23409@capella.cs.uchicago.edu> (raw)
In-Reply-To: <20100905031528.GA2344@burratino>
Rather than planning in advance and saving up a bunch of objects
before a "commit" command, frontends might want to wait until the
middle of a commit and request objects then.
Allow them to.
The new rule: a "cat" request can be inserted wherever a comment
is allowed, which means at the start of any line except in the
middle of a "data" command.
Cc: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: David Barr <david.barr@cordelta.com>
Cc: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
That's it for today. I'll be on vacation for the next couple of weeks
so I can't promise to be responsive. Comments are still welcome,
though (nothing is really different except that the latency may be
longer).
Documentation/git-fast-import.txt | 4 ++
fast-import.c | 27 ++++++++-----
t/t9300-fast-import.sh | 74 +++++++++++++++++++++++++++++++++++++
3 files changed, 94 insertions(+), 11 deletions(-)
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 2cf48f5..b670c7d 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -920,6 +920,10 @@ a path within that tree to retrieve a subtree or blob.
A `<path>` string should be surrounded with quotation marks and
use C-style escaping.
+The `cat` command can be used anywhere that comments are
+acceptable. In particular, the `cat` command can be used in the
+middle of a commit, but not in the middle of a `data` stream.
+
`feature`
~~~~~~~~~
Require that fast-import supports the specified feature, or abort if
diff --git a/fast-import.c b/fast-import.c
index f3c4123..87246d5 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -55,9 +55,6 @@ Format of STDIN stream:
('from' sp committish lf)?
lf?;
- cat_request ::= 'cat' sp (hexsha1 | idnum) lf
- | 'cat' sp hexsha1 sp path_str lf;
-
checkpoint ::= 'checkpoint' lf
lf?;
@@ -135,14 +132,18 @@ Format of STDIN stream:
ts ::= # time since the epoch in seconds, ascii base10 notation;
tz ::= # GIT style timezone;
- # note: comments may appear anywhere in the input, except
- # within a data command. Any form of the data command
- # always escapes the related input from comment processing.
+ # note: comments and cat requests may appear anywhere
+ # in the input, except within a data command. Any form
+ # of the data command always escapes the related input
+ # from comment processing.
#
# In case it is not clear, the '#' that starts the comment
# must be the first character on that line (an lf
# preceded it).
#
+ cat_request ::= 'cat' sp (hexsha1 | idnum) lf
+ | 'cat' sp hexsha1 sp path_str lf;
+
comment ::= '#' not_lf* lf;
not_lf ::= # Any byte that is not ASCII newline (LF);
*/
@@ -368,6 +369,7 @@ static int seen_data_command;
static int report_fd = -1;
static void parse_argv(void);
+static void parse_cat_request(void);
static void write_branch_report(FILE *rpt, struct branch *b)
{
@@ -1777,7 +1779,6 @@ static void read_marks(void)
fclose(f);
}
-
static int read_next_command(void)
{
static int stdin_eof = 0;
@@ -1787,7 +1788,7 @@ static int read_next_command(void)
return EOF;
}
- do {
+ for (;;) {
if (unread_command_buf) {
unread_command_buf = 0;
} else {
@@ -1820,7 +1821,13 @@ static int read_next_command(void)
rc->prev->next = rc;
cmd_tail = rc;
}
- } while (command_buf.buf[0] == '#');
+ if (!prefixcmp(command_buf.buf, "cat ")) {
+ parse_cat_request();
+ continue;
+ }
+ if (command_buf.buf[0] != '#')
+ return 0;
+ }
return 0;
}
@@ -3081,8 +3088,6 @@ int main(int argc, const char **argv)
parse_new_tag();
else if (!prefixcmp(command_buf.buf, "reset "))
parse_reset_branch();
- else if (!prefixcmp(command_buf.buf, "cat "))
- parse_cat_request();
else if (!strcmp("checkpoint", command_buf.buf))
parse_checkpoint();
else if (!prefixcmp(command_buf.buf, "progress "))
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 82e03e8..dcdfbd4 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -1819,6 +1819,80 @@ test_expect_success PIPE 'R: report-fd: can feed back printed blob' '
compare_diff_raw expect actual
'
+test_expect_success PIPE 'R: report-fd: cat commands mid-commit' '
+ cat >expect <<-EOF &&
+ :100755 100644 $file4_id $file4_id C100 file4 file4-copy
+ EOF
+ git cat-file commit refs/heads/branch >expect.commit &&
+ echo tree >expect.type &&
+ git cat-file tree refs/heads/branch >expect.tree &&
+
+ cat >frontend <<-\FRONTEND_END &&
+ #!/bin/sh
+
+ branch=$(git rev-parse --verify refs/heads/branch) &&
+ cat <<EOF &&
+ feature report-fd=3
+ commit refs/heads/catdemo
+ cat $branch
+ EOF
+
+ read commit_id type size <&3 &&
+ dd if=/dev/stdin of=commit bs=1 count=$size <&3 &&
+ read newline <&3 &&
+ read tree tree_id <commit &&
+
+ echo "cat $tree_id" &&
+
+ read tree_id2 type size <&3 &&
+ dd if=/dev/stdin of=tree bs=1 count=$size <&3 &&
+ read newline <&3 &&
+ echo $type >type &&
+
+ grep ^committer commit &&
+ cat <<EOF &&
+ data <<COMMIT
+ copy file4 as file4-copy
+ COMMIT
+
+ from refs/heads/branch^0
+ cat $tree_id "file4"
+ EOF
+
+ read blob_id type size <&3 &&
+ dd if=/dev/stdin of=/dev/null bs=1 count=$size <&3 &&
+ read newline <&3 &&
+
+ cat <<EOF &&
+ M 644 $blob_id "file4-copy"
+ cat $tree_id ""
+
+ EOF
+
+ read tree_id3 type size <&3 &&
+ dd if=/dev/stdin of=tree2 bs=1 count=$size <&3 &&
+ read newline <&3 &&
+ read cid <&3
+ FRONTEND_END
+ chmod +x frontend &&
+
+ mkfifo commits &&
+ test_when_finished "rm -f commits" &&
+ (
+ {
+ sh frontend 3<commits ||
+ exit
+ } |
+ git fast-import 3>commits
+ ) &&
+ git diff-tree -C catdemo^ catdemo >actual &&
+ compare_diff_raw expect actual
+ test_cmp expect.commit commit &&
+ test_cmp expect.type type &&
+ test_cmp expect.tree tree &&
+ test_cmp expect.tree tree2
+'
+
test_expect_success 'R: quiet option results in no stats being output' '
>empty &&
cat >input <<-\EOF &&
--
1.7.3.rc0.6.g7505a.dirty
next prev parent reply other threads:[~2010-09-08 3:27 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-01 3:18 [PATCH/RFC] Teach fast-import to import subtrees named by tree id Jonathan Nieder
2010-07-01 5:48 ` [WIP/PATCH] Teach fast-import to print the id of each imported commit Jonathan Nieder
2010-07-02 3:16 ` Sverre Rabbelier
2010-07-02 3:41 ` Jonathan Nieder
2010-07-02 4:29 ` Sverre Rabbelier
2010-07-02 5:12 ` Jonathan Nieder
2010-07-02 14:55 ` Sverre Rabbelier
2010-07-02 15:40 ` Jonathan Nieder
2010-07-02 15:48 ` Sverre Rabbelier
2010-07-04 0:02 ` Sam Vilain
2010-07-04 0:35 ` Jonathan Nieder
2010-07-04 3:44 ` Sam Vilain
2010-07-04 7:22 ` Jonathan Nieder
2010-08-17 17:02 ` Ramkumar Ramachandra
2010-09-05 3:15 ` [RFC/PATCH 0/3] fast-import: give importers access to the object store Jonathan Nieder
2010-09-05 3:22 ` [PATCH 1/3] t9300 (fast-import): style tweaks Jonathan Nieder
2010-09-24 6:59 ` [PATCH/RFC 00/24] " Jonathan Nieder
2010-09-24 7:04 ` [PATCH 01/24] t9300 (fast-import): avoid exiting early on failure Jonathan Nieder
2010-09-24 7:05 ` [PATCH 02/24] t9300 (fast-import): avoid hard-coded object names Jonathan Nieder
2010-09-24 7:09 ` [PATCH 03/24] t9300 (fast-import): guard "export large marks" test setup Jonathan Nieder
2010-09-24 9:38 ` Ramkumar Ramachandra
2010-09-24 10:56 ` Raja R Harinath
2010-09-24 10:34 ` Ramkumar Ramachandra
2010-09-24 11:01 ` Raja R Harinath
2010-09-24 7:11 ` [PATCH 04/24] t9300 (fast-import): check exit status from upstream of pipes Jonathan Nieder
2010-09-24 7:11 ` [PATCH 05/24] t9300 (fast-import): check exit status from command substitutions Jonathan Nieder
2010-09-24 7:12 ` [PATCH 06/24] t9300 (fast-import): use test_cmp in place of test $(foo) = $(bar) Jonathan Nieder
2010-09-24 7:13 ` [PATCH 07/24] t9300 (fast-import): use tabs to indent Jonathan Nieder
2010-09-24 8:54 ` Ramkumar Ramachandra
2010-09-24 9:21 ` Jonathan Nieder
2010-09-24 7:16 ` [PATCH 08/24] t9300 (fast-import), series A: re-indent Jonathan Nieder
2010-09-24 7:22 ` Sverre Rabbelier
2010-09-24 7:35 ` Jonathan Nieder
2010-09-24 7:18 ` [PATCH 09/24] t9300 (fast-import), series B: re-indent Jonathan Nieder
2010-09-24 7:19 ` [PATCH 10/24] t9300 (fast-import), series C: re-indent Jonathan Nieder
2010-09-24 7:19 ` [PATCH 11/24] t9300 (fast-import), series D: re-indent Jonathan Nieder
2010-09-24 7:21 ` [PATCH 12/24] t9300 (fast-import), series E: re-indent Jonathan Nieder
2010-09-24 7:22 ` [PATCH 13/24] t9300 (fast-import), series F: re-indent Jonathan Nieder
2010-09-24 7:22 ` [PATCH 14/24] t9300 (fast-import), series H: re-indent Jonathan Nieder
2010-09-24 7:23 ` [PATCH 15/24] t9300 (fast-import), series I: re-indent Jonathan Nieder
2010-09-24 7:24 ` [PATCH 16/24] t9300 (fast-import), series J: re-indent Jonathan Nieder
2010-09-24 7:25 ` [PATCH 17/24] t9300 (fast-import), series K: re-indent Jonathan Nieder
2010-09-24 7:25 ` [PATCH 18/24] t9300 (fast-import), series L: re-indent Jonathan Nieder
2010-09-24 7:26 ` [PATCH 19/24] t9300 (fast-import), series M: re-indent Jonathan Nieder
2010-09-24 7:26 ` [PATCH 20/24] t9300 (fast-import), series N: re-indent Jonathan Nieder
2010-09-24 7:27 ` [PATCH 21/24] t9300 (fast-import), series O: re-indent Jonathan Nieder
2010-09-24 7:27 ` [PATCH 22/24] t9300 (fast-import), series P: re-indent Jonathan Nieder
2010-09-24 7:28 ` [PATCH 23/24] t9300 (fast-import), series Q: re-indent Jonathan Nieder
2010-09-24 7:30 ` [PATCH 24/24] t9300 (fast-import), series R: re-indent Jonathan Nieder
2010-09-25 5:19 ` svn-fe status Jonathan Nieder
2010-09-25 10:25 ` Sverre Rabbelier
2010-09-27 2:54 ` Jonathan Nieder
2010-09-27 9:15 ` Sverre Rabbelier
2010-09-05 3:29 ` [PATCH 2/3] Teach fast-import to print the id of each imported commit Jonathan Nieder
2010-09-05 3:41 ` [PATCH 3/3] fast-import: Let importers retrieve the objects being written Jonathan Nieder
2010-09-05 6:08 ` [RFC/PATCH 0/3] fast-import: give importers access to the object store Ramkumar Ramachandra
2010-09-05 6:28 ` Sverre Rabbelier
2010-09-05 8:47 ` Ramkumar Ramachandra
2010-09-05 16:20 ` Sverre Rabbelier
2010-09-05 17:31 ` Jonathan Nieder
2010-09-08 3:13 ` [PATCH 4/3] fast-import: typofix Jonathan Nieder
2010-09-08 3:17 ` [PATCH 5/3] fast-import: allow cat command with empty path Jonathan Nieder
2010-09-08 3:27 ` Jonathan Nieder [this message]
2010-09-08 3:38 ` [PATCH 6/3] fast-import: Allow cat requests at arbitrary points in stream Sverre Rabbelier
2010-09-08 3:57 ` Jonathan Nieder
2010-09-08 10:16 ` Ramkumar Ramachandra
2010-09-16 0:14 ` [RFC/PATCH 0/3] fast-import: give importers access to the object store Sam Vilain
2010-09-17 23:24 ` Sverre Rabbelier
2010-09-24 19:43 ` Jonathan Nieder
2010-09-24 23:44 ` Sverre Rabbelier
2010-09-25 0:01 ` Jonathan Nieder
2010-09-25 0:17 ` Sverre Rabbelier
2010-07-02 3:20 ` [PATCH/RFC] Teach fast-import to import subtrees named by tree id Sverre Rabbelier
2010-07-02 4:42 ` Jonathan Nieder
2010-07-02 12:44 ` Ramkumar Ramachandra
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100908032736.GC23409@capella.cs.uchicago.edu \
--to=jrnieder@gmail.com \
--cc=artagnon@gmail.com \
--cc=david.barr@cordelta.com \
--cc=git@vger.kernel.org \
--cc=sam@vilain.net \
--cc=spearce@spearce.org \
--cc=srabbelier@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).