From: "Clément Poulain" <clement.poulain@ensimag.imag.fr>
To: git@vger.kernel.org
Cc: "Clément Poulain" <clement.poulain@ensimag.imag.fr>,
"Diane Gasselin" <diane.gasselin@ensimag.imag.fr>,
"Axel Bonnet" <axel.bonnet@ensimag.imag.fr>
Subject: [PATCH v3 2/4] textconv: support for cat_file
Date: Wed, 9 Jun 2010 19:02:07 +0200 [thread overview]
Message-ID: <1276102929-31712-3-git-send-email-clement.poulain@ensimag.imag.fr> (raw)
In-Reply-To: <1276102929-31712-2-git-send-email-clement.poulain@ensimag.imag.fr>
Make the textconv_object function public, and add --textconv option to cat-file
to perform conversion on blob objects. Using --textconv implies that we are
working on a blob.
As files drivers need to be initialized, a new config is required in addition
to git_default_config. Therefore git_cat_file_config() is introduced
Signed-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr>
Signed-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr>
Signed-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr>
---
builtin.h | 2 ++
builtin/blame.c | 8 ++++----
builtin/cat-file.c | 33 ++++++++++++++++++++++++++++++---
3 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/builtin.h b/builtin.h
index 5c887ef..7902d4d 100644
--- a/builtin.h
+++ b/builtin.h
@@ -36,6 +36,8 @@ void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c);
extern int check_pager_config(const char *cmd);
+extern int textconv_object(const char *path, const unsigned char *sha1, char **buf, size_t *buf_size);
+
extern int cmd_add(int argc, const char **argv, const char *prefix);
extern int cmd_annotate(int argc, const char **argv, const char *prefix);
extern int cmd_apply(int argc, const char **argv, const char *prefix);
diff --git a/builtin/blame.c b/builtin/blame.c
index 62d040c..d477bbe 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -91,10 +91,10 @@ struct origin {
* if the textconv driver exists.
* Return 1 if the conversion succeeds, 0 otherwise.
*/
-static int textconv_object(const char *path,
- const unsigned char *sha1,
- char **buf,
- size_t *buf_size)
+int textconv_object(const char *path,
+ const unsigned char *sha1,
+ char **buf,
+ size_t *buf_size)
{
struct diff_filespec *df;
struct userdiff_driver *textconv;
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index a933eaa..fc7ec61 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -9,6 +9,8 @@
#include "tree.h"
#include "builtin.h"
#include "parse-options.h"
+#include "diff.h"
+#include "userdiff.h"
#define BATCH 1
#define BATCH_CHECK 2
@@ -86,8 +88,9 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
enum object_type type;
void *buf;
unsigned long size;
+ struct object_context obj_context;
- if (get_sha1(obj_name, sha1))
+ if (get_sha1_with_context(obj_name, sha1, &obj_context))
die("Not a valid object name %s", obj_name);
buf = NULL;
@@ -132,6 +135,17 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
/* otherwise just spit out the data */
break;
+
+ case 'c':
+ if (!obj_context.path[0])
+ die("git cat-file --textconv %s: <object> must be <sha1:path>",
+ obj_name);
+
+ if(!textconv_object(obj_context.path, sha1, (char **) &buf, (size_t *) &size))
+ die("git cat-file --textconv: unable to run textconv on %s",
+ obj_name);
+ break;
+
case 0:
buf = read_object_with_reference(sha1, exp_type, &size, NULL);
break;
@@ -201,11 +215,22 @@ static int batch_objects(int print_contents)
}
static const char * const cat_file_usage[] = {
- "git cat-file (-t|-s|-e|-p|<type>) <object>",
+ "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>",
"git cat-file (--batch|--batch-check) < <list_of_objects>",
NULL
};
+static int git_cat_file_config(const char *var, const char *value, void *cb)
+{
+ switch (userdiff_config(var, value)) {
+ case 0: break;
+ case -1: return -1;
+ default: return 0;
+ }
+
+ return git_default_config(var, value, cb);
+}
+
int cmd_cat_file(int argc, const char **argv, const char *prefix)
{
int opt = 0, batch = 0;
@@ -218,6 +243,8 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
OPT_SET_INT('e', NULL, &opt,
"exit with zero when there's no error", 'e'),
OPT_SET_INT('p', NULL, &opt, "pretty-print object's content", 'p'),
+ OPT_SET_INT(0, "textconv", &opt,
+ "for blob objects, run textconv on object's content", 'c'),
OPT_SET_INT(0, "batch", &batch,
"show info and content of objects fed from the standard input",
BATCH),
@@ -227,7 +254,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
OPT_END()
};
- git_config(git_default_config, NULL);
+ git_config(git_cat_file_config, NULL);
if (argc != 3 && argc != 2)
usage_with_options(cat_file_usage, options);
--
1.6.6.7.ga5fe3
next prev parent reply other threads:[~2010-06-09 17:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-09 17:02 [PATCH v3 0/4] git-gui blame: use textconv Clément Poulain
2010-06-09 17:02 ` [PATCH v3 1/4] sha1_name: add get_sha1_with_context() Clément Poulain
2010-06-09 17:02 ` Clément Poulain [this message]
2010-06-09 17:02 ` [PATCH v3 3/4] git gui: use textconv filter for diff and blame Clément Poulain
2010-06-09 17:02 ` [PATCH v3 4/4] t/t8007: test textconv support for cat-file Clément Poulain
2010-06-14 17:18 ` [PATCH v3 0/4] git-gui blame: use textconv Clément Poulain
2010-06-14 17:29 ` Junio C Hamano
2010-06-16 7:50 ` Matthieu Moy
2010-06-15 15:50 ` [PATCH v3 2/4] textconv: support for cat_file Clément Poulain
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=1276102929-31712-3-git-send-email-clement.poulain@ensimag.imag.fr \
--to=clement.poulain@ensimag.imag.fr \
--cc=axel.bonnet@ensimag.imag.fr \
--cc=diane.gasselin@ensimag.imag.fr \
--cc=git@vger.kernel.org \
/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).