From: Sverre Rabbelier <srabbelier@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>, Jeff King <peff@peff.net>,
Git List <git@vger.kernel.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Ramkumar
Cc: Sverre Rabbelier <srabbelier@gmail.com>
Subject: [PATCH v3 13/23] fast-export: support done feature
Date: Sat, 16 Jul 2011 15:03:33 +0200 [thread overview]
Message-ID: <1310821424-4750-14-git-send-email-srabbelier@gmail.com> (raw)
In-Reply-To: <1310821424-4750-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'.
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
---
Unchanged
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 781bd6e..e3f8453 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 daf1945..becef85 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 full_tree;
@@ -627,6 +628,8 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
"Fake a tagger when tags lack one"),
OPT_BOOLEAN(0, "full-tree", &full_tree,
"Output full tree for each commit"),
+ 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 },
@@ -648,6 +651,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);
@@ -675,5 +681,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.5.1.292.g728120
next prev parent reply other threads:[~2011-07-16 13:05 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-16 13:03 [PATCH v3 00/23] remote-helper improvements Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 01/23] transport-helper: fix minor leak in push_refs_with_export Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 02/23] t5800: factor out some ref tests Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 03/23] t5800: use skip_all instead of prereq Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 04/23] t5800: document some non-functional parts of remote helpers Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 05/23] git-remote-testgit: import non-HEAD refs Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 06/23] transport-helper: don't feed bogus refs to export push Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 07/23] git_remote_helpers: push all refs during a non-local export Sverre Rabbelier
2011-07-17 23:36 ` Junio C Hamano
2011-07-23 11:27 ` Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 08/23] remote-helpers: export GIT_DIR variable to helpers Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 09/23] remote-curl: accept empty line as terminator Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 10/23] git-remote-testgit: only push for non-local repositories Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 11/23] git-remote-testgit: fix error handling Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 12/23] fast-import: introduce 'done' command Sverre Rabbelier
2011-07-16 13:03 ` Sverre Rabbelier [this message]
2011-07-16 13:03 ` [PATCH v3 14/23] transport-helper: factor out push_update_refs_status Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 15/23] transport-helper: check status code of finish_command Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 16/23] transport-helper: use the new done feature where possible Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 17/23] transport-helper: update ref status after push with export Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 18/23] transport-helper: change import semantics Sverre Rabbelier
2011-07-18 11:13 ` Dmitry Ivankov
2011-07-16 13:03 ` [PATCH v3 19/23] transport-helper: Use capname for refspec capability too Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 20/23] transport-helper: implement marks location as capability Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 21/23] transport-helper: die early on encountering deleted refs Sverre Rabbelier
2011-07-16 13:03 ` [RFD/PATCH v3 22/23] t5800: document inability to push new branch with old content Sverre Rabbelier
2011-07-16 13:03 ` [RDD/PATCH v3 23/23] t5800: point out that deleting branches does not work Sverre Rabbelier
2011-07-18 3:28 ` [PATCH v3 00/23] remote-helper improvements Jeff King
2011-07-23 11:28 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1310821424-4750-14-git-send-email-srabbelier@gmail.com \
--to=srabbelier@gmail.com \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).