undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract "log [diff options]" parser out.

Browse Source 
Merging of the log-tree-opt structure with rev-info structure
did not work out very well and it broke things that did not want
diff options and/or rev options.

This is an alternative approach to define a combined interface
that can be used by commands that wants both.  The use of it is
opt-in to reduce the risk of breaking existing programs.

We might want to slurp "setup_revisions() places things in
pending objects list" part from Linus's earlier attempt.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-04-15 03:16:46 -07:00
parent 5069b1cf61
commit f4235f8b2e
3 changed files with 100 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
git.c
View File

@ -280,89 +280,35 @@ static int cmd_help(int argc, const char **argv, char **envp)
static int cmd_log(int argc, const char **argv, char **envp) static int cmd_log(int argc, const char **argv, char **envp)
{ {
struct rev_info rev; struct whatchanged_opt wcopt;
struct commit *commit; struct commit *commit;
char *buf = xmalloc(LOGSIZE); char *buf = xmalloc(LOGSIZE);
static enum cmit_fmt commit_format = CMIT_FMT_DEFAULT;
int abbrev = DEFAULT_ABBREV;
int abbrev_commit = 0;
const char *commit_prefix = "commit "; const char *commit_prefix = "commit ";
struct log_tree_opt opt;
int shown = 0; int shown = 0;
int do_diff = 0; struct rev_info *rev = &wcopt.revopt;
int full_diff = 0; struct log_tree_opt *opt = &wcopt.logopt;
init_log_tree_opt(&opt); init_log_tree_opt(&wcopt.logopt);
argc = setup_revisions(argc, argv, &rev, "HEAD"); wcopt.commit_format = CMIT_FMT_DEFAULT;
while (1 < argc) { wcopt.abbrev = DEFAULT_ABBREV;
const char *arg = argv[1]; argc = parse_whatchanged_opt(argc, argv, &wcopt);
if (!strncmp(arg, "--pretty", 8)) {
commit_format = get_commit_format(arg + 8);
if (commit_format == CMIT_FMT_ONELINE)
commit_prefix = "";
}
else if (!strcmp(arg, "--no-abbrev")) {
abbrev = 0;
}
else if (!strcmp(arg, "--abbrev")) {
abbrev = DEFAULT_ABBREV;
}
else if (!strcmp(arg, "--abbrev-commit")) {
abbrev_commit = 1;
}
else if (!strncmp(arg, "--abbrev=", 9)) {
abbrev = strtoul(arg + 9, NULL, 10);
if (abbrev && abbrev < MINIMUM_ABBREV)
abbrev = MINIMUM_ABBREV;
else if (40 < abbrev)
abbrev = 40;
}
else if (!strcmp(arg, "--full-diff")) {
do_diff = 1;
full_diff = 1;
}
else {
int cnt = log_tree_opt_parse(&opt, argv+1, argc-1);
if (0 < cnt) {
do_diff = 1;
argv += cnt;
argc -= cnt;
continue;
}
die("unrecognized argument: %s", arg);
}
argc--; argv++; if (wcopt.logopt.commit_format == CMIT_FMT_ONELINE)
} commit_prefix = "";
if (do_diff) { prepare_revision_walk(rev);
opt.diffopt.abbrev = abbrev;
opt.verbose_header = 0;
opt.always_show_header = 0;
opt.no_commit_id = 1;
if (opt.combine_merges)
opt.ignore_merges = 0;
if (opt.dense_combined_merges)
opt.diffopt.output_format = DIFF_FORMAT_PATCH;
if (opt.diffopt.output_format == DIFF_FORMAT_PATCH)
opt.diffopt.recursive = 1;
if (!full_diff && rev.prune_data)
diff_tree_setup_paths(rev.prune_data, &opt.diffopt);
diff_setup_done(&opt.diffopt);
}
prepare_revision_walk(&rev);
setup_pager(); setup_pager();
while ((commit = get_revision(&rev)) != NULL) { while ((commit = get_revision(rev)) != NULL) {
if (shown && do_diff && commit_format != CMIT_FMT_ONELINE) if (shown && wcopt.do_diff &&
wcopt.commit_format != CMIT_FMT_ONELINE)
putchar('\n'); putchar('\n');
fputs(commit_prefix, stdout); fputs(commit_prefix, stdout);
if (abbrev_commit && abbrev) if (wcopt.abbrev_commit && wcopt.abbrev)
fputs(find_unique_abbrev(commit->object.sha1, abbrev), fputs(find_unique_abbrev(commit->object.sha1, wcopt.abbrev),
stdout); stdout);
else else
fputs(sha1_to_hex(commit->object.sha1), stdout); fputs(sha1_to_hex(commit->object.sha1), stdout);
if (rev.parents) { if (rev->parents) {
struct commit_list *parents = commit->parents; struct commit_list *parents = commit->parents;
while (parents) { while (parents) {
struct object *o = &(parents->item->object); struct object *o = &(parents->item->object);
@ -381,15 +327,15 @@ static int cmd_log(int argc, const char **argv, char **envp)
parents = parents->next) parents = parents->next)
parents->item->object.flags &= ~TMP_MARK; parents->item->object.flags &= ~TMP_MARK;
} }
if (commit_format == CMIT_FMT_ONELINE) if (wcopt.commit_format == CMIT_FMT_ONELINE)
putchar(' '); putchar(' ');
else else
putchar('\n'); putchar('\n');
pretty_print_commit(commit_format, commit, ~0, buf, pretty_print_commit(wcopt.commit_format, commit, ~0, buf,
LOGSIZE, abbrev); LOGSIZE, wcopt.abbrev);
printf("%s\n", buf); printf("%s\n", buf);
if (do_diff) if (wcopt.do_diff)
log_tree_commit(&opt, commit); log_tree_commit(opt, commit);
shown = 1; shown = 1;
free(commit->buffer); free(commit->buffer);
commit->buffer = NULL; commit->buffer = NULL;

65
log-tree.c
View File

@ -173,3 +173,68 @@ int log_tree_commit(struct log_tree_opt *opt, struct commit *commit)
} }
return 0; return 0;
} }
int parse_whatchanged_opt(int ac, const char **av, struct whatchanged_opt *wcopt)
{
struct rev_info *rev = &wcopt->revopt;
struct log_tree_opt *opt = &wcopt->logopt;
const char **unrecognized = av+1;
int left = 1;
ac = setup_revisions(ac, av, rev, "HEAD");
while (1 < ac) {
const char *arg = av[1];
if (!strncmp(arg, "--pretty", 8)) {
opt->commit_format = get_commit_format(arg + 8);
}
else if (!strcmp(arg, "--no-abbrev")) {
wcopt->abbrev = 0;
}
else if (!strcmp(arg, "--abbrev")) {
wcopt->abbrev = DEFAULT_ABBREV;
}
else if (!strcmp(arg, "--abbrev-commit")) {
wcopt->abbrev_commit = 1;
}
else if (!strncmp(arg, "--abbrev=", 9)) {
wcopt->abbrev = strtoul(arg + 9, NULL, 10);
if (wcopt->abbrev && wcopt->abbrev < MINIMUM_ABBREV)
wcopt->abbrev = MINIMUM_ABBREV;
else if (40 < wcopt->abbrev)
wcopt->abbrev = 40;
}
else if (!strcmp(arg, "--full-diff")) {
wcopt->do_diff = 1;
wcopt->full_diff = 1;
}
else {
int cnt = log_tree_opt_parse(opt, av+1, ac-1);
if (0 < cnt) {
wcopt->do_diff = 1;
av += cnt;
ac -= cnt;
continue;
}
*unrecognized++ = arg;
left++;
}
ac--; av++;
}
if (wcopt->do_diff) {
opt->diffopt.abbrev = wcopt->abbrev;
opt->verbose_header = 0;
opt->always_show_header = 0;
opt->no_commit_id = 1;
if (opt->combine_merges)
opt->ignore_merges = 0;
if (opt->dense_combined_merges)
opt->diffopt.output_format = DIFF_FORMAT_PATCH;
if (opt->diffopt.output_format == DIFF_FORMAT_PATCH)
opt->diffopt.recursive = 1;
if (!wcopt->full_diff && rev->prune_data)
diff_tree_setup_paths(rev->prune_data, &opt->diffopt);
diff_setup_done(&opt->diffopt);
}
return left;
}

14
log-tree.h
View File

@ -1,6 +1,8 @@
#ifndef LOG_TREE_H #ifndef LOG_TREE_H
#define LOG_TREE_H #define LOG_TREE_H
#include "revision.h"
struct log_tree_opt { struct log_tree_opt {
struct diff_options diffopt; struct diff_options diffopt;
int show_root_diff; int show_root_diff;
@ -20,4 +22,16 @@ int log_tree_diff_flush(struct log_tree_opt *);
int log_tree_commit(struct log_tree_opt *, struct commit *); int log_tree_commit(struct log_tree_opt *, struct commit *);
int log_tree_opt_parse(struct log_tree_opt *, const char **, int); int log_tree_opt_parse(struct log_tree_opt *, const char **, int);
struct whatchanged_opt {
struct rev_info revopt;
struct log_tree_opt logopt;
enum cmit_fmt commit_format;
int abbrev;
int abbrev_commit;
int do_diff;
int full_diff;
};
int parse_whatchanged_opt(int, const char **, struct whatchanged_opt *);
#endif #endif