From: Sverre Rabbelier <srabbelier@gmail.com>
To: "Git List" <git@vger.kernel.org>,
"Daniel Barkalow" <barkalow@iabervon.org>,
"Ramkumar Ramachandra" <artagnon@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>
Cc: Sverre Rabbelier <srabbelier@gmail.com>
Subject: [PATCH 02/13] fast-export: support done feature
Date: Sat, 28 Aug 2010 22:45:29 -0500 [thread overview]
Message-ID: <1283053540-27042-3-git-send-email-srabbelier@gmail.com> (raw)
In-Reply-To: <1283053540-27042-1-git-send-email-srabbelier@gmail.com>
If fast-export is being used to generate a fast-import stream that
will be used afterwards it is desirable to indicate the end of the
stream with the new 'done' command.
Add a flag that causes fast-export to end with 'done'.
---
Also very trivial, obviously if the corresponding feature is
removed the flag should be named differently.
Documentation/git-fast-export.txt | 4 ++++
builtin/fast-export.c | 9 +++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt
index 98ec6b5..912562e 100644
--- a/Documentation/git-fast-export.txt
+++ b/Documentation/git-fast-export.txt
@@ -82,6 +82,10 @@ marks the same across runs.
allow that. So fake a tagger to be able to fast-import the
output.
+--use-done-feature::
+ Start the stream with a 'feature done' stanza, and terminate
+ it with a 'done' command.
+
--no-data::
Skip output of blob objects and instead refer to blobs via
their original SHA-1 hash. This is useful when rewriting the
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 9fe25ff..0c39c2e 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -26,6 +26,7 @@ static int progress;
static enum { ABORT, VERBATIM, WARN, STRIP } signed_tag_mode = ABORT;
static enum { ERROR, DROP, REWRITE } tag_of_filtered_mode = ABORT;
static int fake_missing_tagger;
+static int use_done_feature;
static int no_data;
static int parse_opt_signed_tag_mode(const struct option *opt,
@@ -584,6 +585,8 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
"Import marks from this file"),
OPT_BOOLEAN(0, "fake-missing-tagger", &fake_missing_tagger,
"Fake a tagger when tags lack one"),
+ OPT_BOOLEAN(0, "use-done-feature", &use_done_feature,
+ "Use the done feature to terminate the stream"),
{ OPTION_NEGBIT, 0, "data", &no_data, NULL,
"Skip output of blob data",
PARSE_OPT_NOARG | PARSE_OPT_NEGHELP, NULL, 1 },
@@ -605,6 +608,9 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
if (argc > 1)
usage_with_options (fast_export_usage, options);
+ if (use_done_feature)
+ printf("feature done\n");
+
if (import_filename)
import_marks(import_filename);
@@ -629,5 +635,8 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
if (export_filename)
export_marks(export_filename);
+ if (use_done_feature)
+ printf("done\n");
+
return 0;
}
--
1.7.2.1.240.g6a95c3
next prev parent reply other threads:[~2010-08-29 3:47 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-29 3:45 [PATCH 00/13] remote helper improvements Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 01/13] fast-import: add the 'done' command Sverre Rabbelier
2010-08-29 18:59 ` Daniel Barkalow
2010-08-29 20:23 ` Sverre Rabbelier
2010-08-29 21:24 ` Jonathan Nieder
2010-08-29 21:28 ` Sverre Rabbelier
2010-08-29 22:32 ` Jonathan Nieder
2010-08-30 0:30 ` Sverre Rabbelier
2010-08-30 2:02 ` Jonathan Nieder
2010-08-30 2:08 ` Sverre Rabbelier
2010-08-30 2:12 ` Jonathan Nieder
2011-02-13 9:42 ` Jonathan Nieder
2010-08-29 3:45 ` Sverre Rabbelier [this message]
2010-08-29 19:15 ` [PATCH 02/13] fast-export: support done feature Daniel Barkalow
2010-08-29 20:25 ` Sverre Rabbelier
2010-08-29 23:42 ` Tay Ray Chuan
2010-08-30 0:32 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 03/13] transport-helper: factor out push_update_refs_status Sverre Rabbelier
2010-08-29 21:36 ` Jonathan Nieder
2010-08-29 21:45 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 04/13] transport-helper: check status code of finish_command Sverre Rabbelier
2010-08-29 21:52 ` Jonathan Nieder
2010-08-29 3:45 ` [PATCH 05/13] transport-helper: use the new done feature to properly do imports Sverre Rabbelier
2010-08-29 22:02 ` Jonathan Nieder
2010-08-30 0:28 ` Sverre Rabbelier
2010-08-29 3:45 ` [RFC PATCH 06/13] transport-helper: update ref status after push with export Sverre Rabbelier
2010-08-29 22:25 ` Jonathan Nieder
2010-08-30 0:29 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 07/13] transport-helper: change import semantics Sverre Rabbelier
2010-08-29 19:29 ` Daniel Barkalow
2010-08-29 20:26 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 08/13] transport-helper: export should disconnect too Sverre Rabbelier
2010-08-29 19:32 ` Daniel Barkalow
2010-08-29 20:28 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 09/13] transport-helper: Use capname for gitdir capability too Sverre Rabbelier
2010-08-30 1:05 ` Jonathan Nieder
2010-08-29 3:45 ` [PATCH 10/13] transport-helper: implement marks location as capability Sverre Rabbelier
2010-08-29 19:52 ` Daniel Barkalow
2010-08-29 20:17 ` Sverre Rabbelier
2010-08-30 1:31 ` Jonathan Nieder
2010-08-30 1:35 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 11/13] remote-curl: accept empty line as terminator Sverre Rabbelier
2010-08-30 1:39 ` Jonathan Nieder
2010-08-30 2:02 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 12/13] git-remote-testgit: only push for non-local repositories Sverre Rabbelier
2010-08-30 1:48 ` Jonathan Nieder
2010-08-30 1:59 ` Sverre Rabbelier
2010-08-30 2:09 ` Jonathan Nieder
2010-08-29 3:45 ` [PATCH 13/13] git-remote-testgit: fix error handling Sverre Rabbelier
2010-08-30 1:53 ` [PATCH 00/13] remote helper improvements Jonathan Nieder
2010-08-30 2:01 ` Sverre Rabbelier
[not found] ` <1283137728899-5476616.post@n2.nabble.com>
2010-08-30 5:54 ` Sverre Rabbelier
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=1283053540-27042-3-git-send-email-srabbelier@gmail.com \
--to=srabbelier@gmail.com \
--cc=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@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).