mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
textconv: support for cat_file
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
573285e552
commit
e5fba602e5
|
@ -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, unsigned long *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);
|
||||
|
|
|
@ -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,
|
||||
unsigned long *buf_size)
|
||||
int textconv_object(const char *path,
|
||||
const unsigned char *sha1,
|
||||
char **buf,
|
||||
unsigned long *buf_size)
|
||||
{
|
||||
struct diff_filespec *df;
|
||||
struct userdiff_driver *textconv;
|
||||
|
|
|
@ -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
|
||||
|
@ -84,10 +86,11 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
|
|||
{
|
||||
unsigned char sha1[20];
|
||||
enum object_type type;
|
||||
void *buf;
|
||||
char *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, &buf, &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,25 @@ 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 +246,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 +257,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);
|
||||
|
|
Loading…
Reference in a new issue