[PATCH] Prepare diffcore interface for diff-tree header supression.
This does not actually supress the extra headers when pickaxe is used, but prepares enough support for diff-tree to implement it. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
58b103f55d
commit
38c6f78059
10
diff-cache.c
10
diff-cache.c
@ -214,9 +214,7 @@ int main(int argc, char **argv)
|
|||||||
if (argc != 2 || get_sha1(argv[1], tree_sha1))
|
if (argc != 2 || get_sha1(argv[1], tree_sha1))
|
||||||
usage(diff_cache_usage);
|
usage(diff_cache_usage);
|
||||||
|
|
||||||
diff_setup(detect_rename, diff_score_opt, pickaxe,
|
diff_setup(reverse_diff, (generate_patch ? -1 : line_termination));
|
||||||
reverse_diff, (generate_patch ? -1 : line_termination),
|
|
||||||
NULL, 0);
|
|
||||||
|
|
||||||
mark_merge_entries();
|
mark_merge_entries();
|
||||||
|
|
||||||
@ -227,6 +225,10 @@ int main(int argc, char **argv)
|
|||||||
die("unable to read tree object %s", argv[1]);
|
die("unable to read tree object %s", argv[1]);
|
||||||
|
|
||||||
ret = diff_cache(active_cache, active_nr);
|
ret = diff_cache(active_cache, active_nr);
|
||||||
diff_flush();
|
if (detect_rename)
|
||||||
|
diff_detect_rename(detect_rename, diff_score_opt);
|
||||||
|
if (pickaxe)
|
||||||
|
diff_pickaxe(pickaxe);
|
||||||
|
diff_flush(NULL, 0);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
10
diff-files.c
10
diff-files.c
@ -92,9 +92,7 @@ int main(int argc, char **argv)
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
diff_setup(detect_rename, diff_score_opt, pickaxe,
|
diff_setup(reverse_diff, (generate_patch ? -1 : line_termination));
|
||||||
reverse_diff, (generate_patch ? -1 : line_termination),
|
|
||||||
NULL, 0);
|
|
||||||
|
|
||||||
for (i = 0; i < entries; i++) {
|
for (i = 0; i < entries; i++) {
|
||||||
struct stat st;
|
struct stat st;
|
||||||
@ -136,6 +134,10 @@ int main(int argc, char **argv)
|
|||||||
show_modified(oldmode, mode, ce->sha1, null_sha1,
|
show_modified(oldmode, mode, ce->sha1, null_sha1,
|
||||||
ce->name);
|
ce->name);
|
||||||
}
|
}
|
||||||
diff_flush();
|
if (detect_rename)
|
||||||
|
diff_detect_rename(detect_rename, diff_score_opt);
|
||||||
|
if (pickaxe)
|
||||||
|
diff_pickaxe(pickaxe);
|
||||||
|
diff_flush(NULL, 0);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -127,10 +127,7 @@ int main(int ac, const char **av) {
|
|||||||
}
|
}
|
||||||
/* the remaining parameters are paths patterns */
|
/* the remaining parameters are paths patterns */
|
||||||
|
|
||||||
diff_setup(detect_rename, diff_score_opt, pickaxe,
|
diff_setup(reverse, (generate_patch ? -1 : line_termination));
|
||||||
reverse, (generate_patch ? -1 : line_termination),
|
|
||||||
av+1, ac-1);
|
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
int status;
|
int status;
|
||||||
read_line(&sb, stdin, line_termination);
|
read_line(&sb, stdin, line_termination);
|
||||||
@ -138,11 +135,15 @@ int main(int ac, const char **av) {
|
|||||||
break;
|
break;
|
||||||
status = parse_diff_raw_output(sb.buf);
|
status = parse_diff_raw_output(sb.buf);
|
||||||
if (status) {
|
if (status) {
|
||||||
diff_flush();
|
diff_flush(av+1, ac-1);
|
||||||
printf("%s%c", sb.buf, line_termination);
|
printf("%s%c", sb.buf, line_termination);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
diff_flush();
|
if (detect_rename)
|
||||||
|
diff_detect_rename(detect_rename, diff_score_opt);
|
||||||
|
if (pickaxe)
|
||||||
|
diff_pickaxe(pickaxe);
|
||||||
|
diff_flush(av+1, ac-1);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
26
diff-tree.c
26
diff-tree.c
@ -267,16 +267,28 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
|
|||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void call_diff_setup(void)
|
||||||
|
{
|
||||||
|
diff_setup(reverse_diff, (generate_patch ? -1 : line_termination));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void call_diff_flush(void)
|
||||||
|
{
|
||||||
|
if (detect_rename)
|
||||||
|
diff_detect_rename(detect_rename, diff_score_opt);
|
||||||
|
if (pickaxe)
|
||||||
|
diff_pickaxe(pickaxe);
|
||||||
|
diff_flush(NULL, 0);
|
||||||
|
}
|
||||||
|
|
||||||
static int diff_tree_sha1_top(const unsigned char *old,
|
static int diff_tree_sha1_top(const unsigned char *old,
|
||||||
const unsigned char *new, const char *base)
|
const unsigned char *new, const char *base)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
diff_setup(detect_rename, diff_score_opt, pickaxe,
|
call_diff_setup();
|
||||||
reverse_diff, (generate_patch ? -1 : line_termination),
|
|
||||||
NULL, 0);
|
|
||||||
ret = diff_tree_sha1(old, new, base);
|
ret = diff_tree_sha1(old, new, base);
|
||||||
diff_flush();
|
call_diff_flush();
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -286,15 +298,13 @@ static int diff_root_tree(const unsigned char *new, const char *base)
|
|||||||
void *tree;
|
void *tree;
|
||||||
unsigned long size;
|
unsigned long size;
|
||||||
|
|
||||||
diff_setup(detect_rename, diff_score_opt, pickaxe,
|
call_diff_setup();
|
||||||
reverse_diff, (generate_patch ? -1 : line_termination),
|
|
||||||
NULL, 0);
|
|
||||||
tree = read_object_with_reference(new, "tree", &size, NULL);
|
tree = read_object_with_reference(new, "tree", &size, NULL);
|
||||||
if (!tree)
|
if (!tree)
|
||||||
die("unable to read root tree (%s)", sha1_to_hex(new));
|
die("unable to read root tree (%s)", sha1_to_hex(new));
|
||||||
retval = diff_tree("", 0, tree, size, base);
|
retval = diff_tree("", 0, tree, size, base);
|
||||||
free(tree);
|
free(tree);
|
||||||
diff_flush();
|
call_diff_flush();
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
43
diff.c
43
diff.c
@ -12,13 +12,10 @@
|
|||||||
static const char *diff_opts = "-pu";
|
static const char *diff_opts = "-pu";
|
||||||
static unsigned char null_sha1[20] = { 0, };
|
static unsigned char null_sha1[20] = { 0, };
|
||||||
|
|
||||||
static int detect_rename;
|
|
||||||
static int reverse_diff;
|
static int reverse_diff;
|
||||||
static int diff_raw_output = -1;
|
static int diff_raw_output = -1;
|
||||||
static const char **pathspec;
|
static const char **pathspec;
|
||||||
static int speccnt;
|
static int speccnt;
|
||||||
static const char *pickaxe;
|
|
||||||
static int minimum_score;
|
|
||||||
|
|
||||||
static const char *external_diff(void)
|
static const char *external_diff(void)
|
||||||
{
|
{
|
||||||
@ -512,21 +509,13 @@ int diff_scoreopt_parse(const char *opt)
|
|||||||
return MAX_SCORE * num / scale;
|
return MAX_SCORE * num / scale;
|
||||||
}
|
}
|
||||||
|
|
||||||
void diff_setup(int detect_rename_, int minimum_score_,
|
void diff_setup(int reverse_diff_, int diff_raw_output_)
|
||||||
const char *pickaxe_,
|
|
||||||
int reverse_diff_, int diff_raw_output_,
|
|
||||||
const char **pathspec_, int speccnt_)
|
|
||||||
{
|
{
|
||||||
detect_rename = detect_rename_;
|
|
||||||
reverse_diff = reverse_diff_;
|
reverse_diff = reverse_diff_;
|
||||||
pathspec = pathspec_;
|
|
||||||
diff_raw_output = diff_raw_output_;
|
diff_raw_output = diff_raw_output_;
|
||||||
speccnt = speccnt_;
|
|
||||||
minimum_score = minimum_score_ ? : DEFAULT_MINIMUM_SCORE;
|
|
||||||
pickaxe = pickaxe_;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct diff_queue_struct queued_diff;
|
struct diff_queue_struct diff_queued_diff;
|
||||||
|
|
||||||
struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
|
struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
|
||||||
struct diff_filespec *one,
|
struct diff_filespec *one,
|
||||||
@ -636,15 +625,27 @@ static void diff_flush_one(struct diff_filepair *p)
|
|||||||
diff_flush_patch(p);
|
diff_flush_patch(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
void diff_flush(void)
|
int diff_queue_is_empty(void)
|
||||||
{
|
{
|
||||||
struct diff_queue_struct *q = &queued_diff;
|
struct diff_queue_struct *q = &diff_queued_diff;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (detect_rename)
|
for (i = 0; i < q->nr; i++) {
|
||||||
diff_detect_rename(q, detect_rename, minimum_score);
|
struct diff_filepair *p = q->queue[i];
|
||||||
if (pickaxe)
|
if (!identical(p->one, p->two))
|
||||||
diff_pickaxe(q, pickaxe);
|
return 0;
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void diff_flush(const char **pathspec_, int speccnt_)
|
||||||
|
{
|
||||||
|
struct diff_queue_struct *q = &diff_queued_diff;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
pathspec = pathspec_;
|
||||||
|
speccnt = speccnt_;
|
||||||
|
|
||||||
for (i = 0; i < q->nr; i++)
|
for (i = 0; i < q->nr; i++)
|
||||||
diff_flush_one(q->queue[i]);
|
diff_flush_one(q->queue[i]);
|
||||||
|
|
||||||
@ -693,7 +694,7 @@ void diff_addremove(int addremove, unsigned mode,
|
|||||||
if (addremove != '-')
|
if (addremove != '-')
|
||||||
fill_filespec(two, sha1, mode);
|
fill_filespec(two, sha1, mode);
|
||||||
|
|
||||||
diff_queue(&queued_diff, one, two);
|
diff_queue(&diff_queued_diff, one, two);
|
||||||
}
|
}
|
||||||
|
|
||||||
void diff_change(unsigned old_mode, unsigned new_mode,
|
void diff_change(unsigned old_mode, unsigned new_mode,
|
||||||
@ -716,7 +717,7 @@ void diff_change(unsigned old_mode, unsigned new_mode,
|
|||||||
fill_filespec(one, old_sha1, old_mode);
|
fill_filespec(one, old_sha1, old_mode);
|
||||||
fill_filespec(two, new_sha1, new_mode);
|
fill_filespec(two, new_sha1, new_mode);
|
||||||
|
|
||||||
diff_queue(&queued_diff, one, two);
|
diff_queue(&diff_queued_diff, one, two);
|
||||||
}
|
}
|
||||||
|
|
||||||
void diff_unmerge(const char *path)
|
void diff_unmerge(const char *path)
|
||||||
|
12
diff.h
12
diff.h
@ -19,11 +19,13 @@ extern void diff_unmerge(const char *path);
|
|||||||
|
|
||||||
extern int diff_scoreopt_parse(const char *opt);
|
extern int diff_scoreopt_parse(const char *opt);
|
||||||
|
|
||||||
extern void diff_setup(int detect_rename, int minimum_score,
|
extern void diff_setup(int reverse, int diff_raw_output);
|
||||||
const char *pickaxe,
|
|
||||||
int reverse, int raw_output,
|
|
||||||
const char **spec, int cnt);
|
|
||||||
|
|
||||||
extern void diff_flush(void);
|
extern void diff_detect_rename(int, int);
|
||||||
|
extern void diff_pickaxe(const char *);
|
||||||
|
|
||||||
|
extern int diff_queue_is_empty(void);
|
||||||
|
|
||||||
|
extern void diff_flush(const char **, int);
|
||||||
|
|
||||||
#endif /* DIFF_H */
|
#endif /* DIFF_H */
|
||||||
|
@ -21,8 +21,9 @@ static int contains(struct diff_filespec *one,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void diff_pickaxe(struct diff_queue_struct *q, const char *needle)
|
void diff_pickaxe(const char *needle)
|
||||||
{
|
{
|
||||||
|
struct diff_queue_struct *q = &diff_queued_diff;
|
||||||
unsigned long len = strlen(needle);
|
unsigned long len = strlen(needle);
|
||||||
int i;
|
int i;
|
||||||
struct diff_queue_struct outq;
|
struct diff_queue_struct outq;
|
||||||
|
@ -224,10 +224,10 @@ static int needs_to_stay(struct diff_queue_struct *q, int i,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void diff_detect_rename(struct diff_queue_struct *q,
|
void diff_detect_rename(int detect_rename,
|
||||||
int detect_rename,
|
|
||||||
int minimum_score)
|
int minimum_score)
|
||||||
{
|
{
|
||||||
|
struct diff_queue_struct *q = &diff_queued_diff;
|
||||||
struct diff_queue_struct outq;
|
struct diff_queue_struct outq;
|
||||||
struct diff_rename_pool created, deleted, stay;
|
struct diff_rename_pool created, deleted, stay;
|
||||||
struct diff_rename_pool *(srcs[2]);
|
struct diff_rename_pool *(srcs[2]);
|
||||||
|
@ -52,10 +52,9 @@ struct diff_queue_struct {
|
|||||||
int nr;
|
int nr;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extern struct diff_queue_struct diff_queued_diff;
|
||||||
extern struct diff_filepair *diff_queue(struct diff_queue_struct *,
|
extern struct diff_filepair *diff_queue(struct diff_queue_struct *,
|
||||||
struct diff_filespec *,
|
struct diff_filespec *,
|
||||||
struct diff_filespec *);
|
struct diff_filespec *);
|
||||||
extern void diff_detect_rename(struct diff_queue_struct *, int, int);
|
|
||||||
extern void diff_pickaxe(struct diff_queue_struct *, const char *);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user