mirror of
https://github.com/git/git.git
synced 2024-10-05 19:41:52 +02:00
cd2bdc5309
This basically does a few things that are sadly somewhat interdependent, and nontrivial to split out - get rid of "struct log_tree_opt" The fields in "log_tree_opt" are moved into "struct rev_info", and all users of log_tree_opt are changed to use the rev_info struct instead. - add the parsing for the log_tree_opt arguments to "setup_revision()" - make setup_revision set a flag (revs->diff) if the diff-related arguments were used. This allows "git log" to decide whether it wants to show diffs or not. - make setup_revision() also initialize the diffopt part of rev_info (which we had from before, but we just didn't initialize it) - make setup_revision() do all the "finishing touches" on it all (it will do the proper flag combination logic, and call "diff_setup_done()") Now, that was the easy and straightforward part. The slightly more involved part is that some of the programs that want to use the new-and-improved rev_info parsing don't actually want _commits_, they may want tree'ish arguments instead. That meant that I had to change setup_revision() to parse the arguments not into the "revs->commits" list, but into the "revs->pending_objects" list. Then, when we do "prepare_revision_walk()", we walk that list, and create the sorted commit list from there. This actually cleaned some stuff up, but it's the less obvious part of the patch, and re-organized the "revision.c" logic somewhat. It actually paves the way for splitting argument parsing _entirely_ out of "revision.c", since now the argument parsing really is totally independent of the commit walking: that didn't use to be true, since there was lots of overlap with get_commit_reference() handling etc, now the _only_ overlap is the shared (and trivial) "add_pending_object()" thing. However, I didn't do that file split, just because I wanted the diff itself to be smaller, and show the actual changes more clearly. If this gets accepted, I'll do further cleanups then - that includes the file split, but also using the new infrastructure to do a nicer "git diff" etc. Even in this form, it actually ends up removing more lines than it adds. It's nice to note how simple and straightforward this makes the built-in "git log" command, even though it continues to support all the diff flags too. It doesn't get much simpler that this. I think this is worth merging soonish, because it does allow for future cleanup and even more sharing of code. However, it obviously touches "revision.c", which is subtle. I've tested that it passes all the tests we have, and it passes my "looks sane" detector, but somebody else should also give it a good look-over. [jc: squashed the original and three "oops this too" updates, with another fix-up.] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
126 lines
3.2 KiB
C
126 lines
3.2 KiB
C
#include "cache.h"
|
|
#include "diff.h"
|
|
#include "commit.h"
|
|
#include "log-tree.h"
|
|
|
|
int log_tree_diff_flush(struct rev_info *opt)
|
|
{
|
|
diffcore_std(&opt->diffopt);
|
|
if (diff_queue_is_empty()) {
|
|
int saved_fmt = opt->diffopt.output_format;
|
|
opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
|
|
diff_flush(&opt->diffopt);
|
|
opt->diffopt.output_format = saved_fmt;
|
|
return 0;
|
|
}
|
|
if (opt->header) {
|
|
if (!opt->no_commit_id)
|
|
printf("%s%c", opt->header,
|
|
opt->diffopt.line_termination);
|
|
opt->header = NULL;
|
|
}
|
|
diff_flush(&opt->diffopt);
|
|
return 1;
|
|
}
|
|
|
|
static int diff_root_tree(struct rev_info *opt,
|
|
const unsigned char *new, const char *base)
|
|
{
|
|
int retval;
|
|
void *tree;
|
|
struct tree_desc empty, real;
|
|
|
|
tree = read_object_with_reference(new, tree_type, &real.size, NULL);
|
|
if (!tree)
|
|
die("unable to read root tree (%s)", sha1_to_hex(new));
|
|
real.buf = tree;
|
|
|
|
empty.buf = "";
|
|
empty.size = 0;
|
|
retval = diff_tree(&empty, &real, base, &opt->diffopt);
|
|
free(tree);
|
|
log_tree_diff_flush(opt);
|
|
return retval;
|
|
}
|
|
|
|
static const char *generate_header(struct rev_info *opt,
|
|
const unsigned char *commit_sha1,
|
|
const unsigned char *parent_sha1,
|
|
const struct commit *commit)
|
|
{
|
|
static char this_header[16384];
|
|
int offset;
|
|
unsigned long len;
|
|
int abbrev = opt->diffopt.abbrev;
|
|
const char *msg = commit->buffer;
|
|
|
|
if (!opt->verbose_header)
|
|
return sha1_to_hex(commit_sha1);
|
|
|
|
len = strlen(msg);
|
|
|
|
offset = sprintf(this_header, "%s%s ",
|
|
opt->header_prefix,
|
|
diff_unique_abbrev(commit_sha1, abbrev));
|
|
if (commit_sha1 != parent_sha1)
|
|
offset += sprintf(this_header + offset, "(from %s)\n",
|
|
parent_sha1
|
|
? diff_unique_abbrev(parent_sha1, abbrev)
|
|
: "root");
|
|
else
|
|
offset += sprintf(this_header + offset, "(from parents)\n");
|
|
offset += pretty_print_commit(opt->commit_format, commit, len,
|
|
this_header + offset,
|
|
sizeof(this_header) - offset, abbrev);
|
|
if (opt->always_show_header) {
|
|
puts(this_header);
|
|
return NULL;
|
|
}
|
|
return this_header;
|
|
}
|
|
|
|
static int do_diff_combined(struct rev_info *opt, struct commit *commit)
|
|
{
|
|
unsigned const char *sha1 = commit->object.sha1;
|
|
|
|
opt->header = generate_header(opt, sha1, sha1, commit);
|
|
opt->header = diff_tree_combined_merge(sha1, opt->header,
|
|
opt->dense_combined_merges,
|
|
&opt->diffopt);
|
|
if (!opt->header && opt->verbose_header)
|
|
opt->header_prefix = "\ndiff-tree ";
|
|
return 0;
|
|
}
|
|
|
|
int log_tree_commit(struct rev_info *opt, struct commit *commit)
|
|
{
|
|
struct commit_list *parents;
|
|
unsigned const char *sha1 = commit->object.sha1;
|
|
|
|
/* Root commit? */
|
|
if (opt->show_root_diff && !commit->parents) {
|
|
opt->header = generate_header(opt, sha1, NULL, commit);
|
|
diff_root_tree(opt, sha1, "");
|
|
}
|
|
|
|
/* More than one parent? */
|
|
if (commit->parents && commit->parents->next) {
|
|
if (opt->ignore_merges)
|
|
return 0;
|
|
else if (opt->combine_merges)
|
|
return do_diff_combined(opt, commit);
|
|
}
|
|
|
|
for (parents = commit->parents; parents; parents = parents->next) {
|
|
struct commit *parent = parents->item;
|
|
unsigned const char *psha1 = parent->object.sha1;
|
|
opt->header = generate_header(opt, sha1, psha1, commit);
|
|
diff_tree_sha1(psha1, sha1, "", &opt->diffopt);
|
|
log_tree_diff_flush(opt);
|
|
|
|
if (!opt->header && opt->verbose_header)
|
|
opt->header_prefix = "\ndiff-tree ";
|
|
}
|
|
return 0;
|
|
}
|