From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Ramkumar Ramachandra <artagnon@gmail.com>,
Duy Nguyen <pclouds@gmail.com>, Brandon Casey <drafnel@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 05/10] cat-file: refactor --batch option parsing
Date: Wed, 10 Jul 2013 07:38:58 -0400 [thread overview]
Message-ID: <20130710113858.GE21963@sigill.intra.peff.net> (raw)
In-Reply-To: <20130710113447.GA20113@sigill.intra.peff.net>
We currently use an int to tell us whether --batch parsing
is on, and if so, whether we should print the full object
contents. Let's instead factor this into a struct, filled in
by callback, which will make further batch-related options
easy to add.
Signed-off-by: Jeff King <peff@peff.net>
---
builtin/cat-file.c | 56 ++++++++++++++++++++++++++++++++++++------------------
1 file changed, 38 insertions(+), 18 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 70dd8c8..5254fe8 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -13,9 +13,6 @@
#include "userdiff.h"
#include "streaming.h"
-#define BATCH 1
-#define BATCH_CHECK 2
-
static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
{
unsigned char sha1[20];
@@ -142,7 +139,12 @@ static void print_object_or_die(int fd, const unsigned char *sha1,
}
}
-static int batch_one_object(const char *obj_name, int print_contents)
+struct batch_options {
+ int enabled;
+ int print_contents;
+};
+
+static int batch_one_object(const char *obj_name, struct batch_options *opt)
{
unsigned char sha1[20];
enum object_type type = 0;
@@ -167,19 +169,19 @@ static int batch_objects(int print_contents)
printf("%s %s %lu\n", sha1_to_hex(sha1), typename(type), size);
fflush(stdout);
- if (print_contents == BATCH) {
+ if (opt->print_contents) {
print_object_or_die(1, sha1, type, size);
write_or_die(1, "\n", 1);
}
return 0;
}
-static int batch_objects(int print_contents)
+static int batch_objects(struct batch_options *opt)
{
struct strbuf buf = STRBUF_INIT;
while (strbuf_getline(&buf, stdin, '\n') != EOF) {
- int error = batch_one_object(buf.buf, print_contents);
+ int error = batch_one_object(buf.buf, opt);
if (error)
return error;
}
@@ -201,10 +203,28 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
return git_default_config(var, value, cb);
}
+static int batch_option_callback(const struct option *opt,
+ const char *arg,
+ int unset)
+{
+ struct batch_options *bo = opt->value;
+
+ if (unset) {
+ memset(bo, 0, sizeof(*bo));
+ return 0;
+ }
+
+ bo->enabled = 1;
+ bo->print_contents = !strcmp(opt->long_name, "batch");
+
+ return 0;
+}
+
int cmd_cat_file(int argc, const char **argv, const char *prefix)
{
- int opt = 0, batch = 0;
+ int opt = 0;
const char *exp_type = NULL, *obj_name = NULL;
+ struct batch_options batch = {0};
const struct option options[] = {
OPT_GROUP(N_("<type> can be one of: blob, tree, commit, tag")),
@@ -215,12 +235,12 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
OPT_SET_INT('p', NULL, &opt, N_("pretty-print object's content"), 'p'),
OPT_SET_INT(0, "textconv", &opt,
N_("for blob objects, run textconv on object's content"), 'c'),
- OPT_SET_INT(0, "batch", &batch,
- N_("show info and content of objects fed from the standard input"),
- BATCH),
- OPT_SET_INT(0, "batch-check", &batch,
- N_("show info about objects fed from the standard input"),
- BATCH_CHECK),
+ { OPTION_CALLBACK, 0, "batch", &batch, NULL,
+ N_("show info and content of objects fed from the standard input"),
+ PARSE_OPT_NOARG, batch_option_callback },
+ { OPTION_CALLBACK, 0, "batch-check", &batch, NULL,
+ N_("show info about objects fed from the standard input"),
+ PARSE_OPT_NOARG, batch_option_callback },
OPT_END()
};
@@ -237,19 +257,19 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
else
usage_with_options(cat_file_usage, options);
}
- if (!opt && !batch) {
+ if (!opt && !batch.enabled) {
if (argc == 2) {
exp_type = argv[0];
obj_name = argv[1];
} else
usage_with_options(cat_file_usage, options);
}
- if (batch && (opt || argc)) {
+ if (batch.enabled && (opt || argc)) {
usage_with_options(cat_file_usage, options);
}
- if (batch)
- return batch_objects(batch);
+ if (batch.enabled)
+ return batch_objects(&batch);
return cat_one_file(opt, exp_type, obj_name);
}
--
1.8.3.rc3.24.gec82cb9
next prev parent reply other threads:[~2013-07-10 11:39 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-07 10:01 [RFC/PATCH 0/4] cat-file --batch-disk-sizes Jeff King
2013-07-07 10:03 ` [PATCH 1/4] zero-initialize object_info structs Jeff King
2013-07-07 17:34 ` Junio C Hamano
2013-07-07 10:04 ` [PATCH 2/4] teach sha1_object_info_extended a "disk_size" query Jeff King
2013-07-07 10:09 ` [PATCH 3/4] cat-file: add --batch-disk-sizes option Jeff King
2013-07-07 17:49 ` Junio C Hamano
2013-07-07 18:19 ` Jeff King
2013-07-08 11:04 ` Duy Nguyen
2013-07-08 12:00 ` Ramkumar Ramachandra
2013-07-08 13:13 ` Duy Nguyen
2013-07-08 13:37 ` Ramkumar Ramachandra
2013-07-09 2:55 ` Duy Nguyen
2013-07-09 10:32 ` Ramkumar Ramachandra
2013-07-10 11:16 ` Jeff King
2013-07-08 16:40 ` Junio C Hamano
2013-07-10 11:04 ` Jeff King
2013-07-11 16:35 ` Junio C Hamano
2013-07-07 21:15 ` brian m. carlson
2013-07-10 10:57 ` Jeff King
2013-07-07 10:14 ` [PATCH 4/4] pack-revindex: radix-sort the revindex Jeff King
2013-07-07 23:52 ` Shawn Pearce
2013-07-08 7:57 ` Jeff King
2013-07-08 15:38 ` Shawn Pearce
2013-07-08 20:50 ` Brandon Casey
2013-07-08 21:35 ` Brandon Casey
2013-07-10 10:57 ` Jeff King
2013-07-10 10:52 ` Jeff King
2013-07-10 11:34 ` [PATCHv2 00/10] cat-file formats/on-disk sizes Jeff King
2013-07-10 11:35 ` [PATCH 01/10] zero-initialize object_info structs Jeff King
2013-07-10 11:35 ` [PATCH 02/10] teach sha1_object_info_extended a "disk_size" query Jeff King
2013-07-10 11:36 ` [PATCH 03/10] t1006: modernize output comparisons Jeff King
2013-07-10 11:38 ` [PATCH 04/10] cat-file: teach --batch to stream blob objects Jeff King
2013-07-10 11:38 ` Jeff King [this message]
2013-07-10 11:45 ` [PATCH 06/10] cat-file: add --batch-check=<format> Jeff King
2013-07-10 11:57 ` Eric Sunshine
2013-07-10 14:51 ` Ramkumar Ramachandra
2013-07-11 11:24 ` Jeff King
2013-07-10 11:46 ` [PATCH 07/10] cat-file: add %(objectsize:disk) format atom Jeff King
2013-07-10 11:48 ` [PATCH 08/10] cat-file: split --batch input lines on whitespace Jeff King
2013-07-10 15:29 ` Ramkumar Ramachandra
2013-07-11 11:36 ` Jeff King
2013-07-11 17:42 ` Junio C Hamano
2013-07-11 20:45 ` [PATCHv3 " Jeff King
2013-07-10 11:50 ` [PATCH 09/10] pack-revindex: use unsigned to store number of objects Jeff King
2013-07-10 11:55 ` [PATCH 10/10] pack-revindex: radix-sort the revindex Jeff King
2013-07-10 12:00 ` Jeff King
2013-07-10 13:17 ` Ramkumar Ramachandra
2013-07-11 11:03 ` Jeff King
2013-07-10 17:10 ` Brandon Casey
2013-07-11 11:17 ` Jeff King
2013-07-11 12:16 ` [PATCHv3 " Jeff King
2013-07-11 21:12 ` Brandon Casey
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=20130710113858.GE21963@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=artagnon@gmail.com \
--cc=drafnel@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@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).