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

whatchanged: Default to DIFF_FORMAT_RAW

Browse Source 
Split cmd_log_wc() to cmd_log_init() and cmd_log_walk() and set default
diff output format for whatchanged to DIFF_FORMAT_RAW.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Timo Hirvonen 2006-06-25 15:39:35 +03:00 committed by Junio C Hamano
parent 5e2b0636c7
commit 9dafea2678
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
builtin-log.c
View File

@ -14,22 +14,22 @@
/* this is in builtin-diff.c */ /* this is in builtin-diff.c */
void add_head(struct rev_info *revs); void add_head(struct rev_info *revs);
static int cmd_log_wc(int argc, const char **argv, char **envp, static void cmd_log_init(int argc, const char **argv, char **envp,
struct rev_info *rev) struct rev_info *rev)
{ {
struct commit *commit;
rev->abbrev = DEFAULT_ABBREV; rev->abbrev = DEFAULT_ABBREV;
rev->commit_format = CMIT_FMT_DEFAULT; rev->commit_format = CMIT_FMT_DEFAULT;
rev->verbose_header = 1; rev->verbose_header = 1;
argc = setup_revisions(argc, argv, rev, "HEAD"); argc = setup_revisions(argc, argv, rev, "HEAD");
if (rev->always_show_header) { if (rev->diffopt.pickaxe || rev->diffopt.filter)
if (rev->diffopt.pickaxe || rev->diffopt.filter) rev->always_show_header = 0;
rev->always_show_header = 0;
}
if (argc > 1) if (argc > 1)
die("unrecognized argument: %s", argv[1]); die("unrecognized argument: %s", argv[1]);
}
static int cmd_log_walk(struct rev_info *rev)
{
struct commit *commit;
prepare_revision_walk(rev); prepare_revision_walk(rev);
setup_pager(); setup_pager();
@ -51,7 +51,10 @@ int cmd_whatchanged(int argc, const char **argv, char **envp)
rev.diff = 1; rev.diff = 1;
rev.diffopt.recursive = 1; rev.diffopt.recursive = 1;
rev.simplify_history = 0; rev.simplify_history = 0;
return cmd_log_wc(argc, argv, envp, &rev); cmd_log_init(argc, argv, envp, &rev);
if (!rev.diffopt.output_format)
rev.diffopt.output_format = DIFF_FORMAT_RAW;
return cmd_log_walk(&rev);
} }
int cmd_show(int argc, const char **argv, char **envp) int cmd_show(int argc, const char **argv, char **envp)
@ -66,7 +69,8 @@ int cmd_show(int argc, const char **argv, char **envp)
rev.always_show_header = 1; rev.always_show_header = 1;
rev.ignore_merges = 0; rev.ignore_merges = 0;
rev.no_walk = 1; rev.no_walk = 1;
return cmd_log_wc(argc, argv, envp, &rev); cmd_log_init(argc, argv, envp, &rev);
return cmd_log_walk(&rev);
} }
int cmd_log(int argc, const char **argv, char **envp) int cmd_log(int argc, const char **argv, char **envp)
@ -76,7 +80,8 @@ int cmd_log(int argc, const char **argv, char **envp)
init_revisions(&rev); init_revisions(&rev);
rev.always_show_header = 1; rev.always_show_header = 1;
rev.diffopt.recursive = 1; rev.diffopt.recursive = 1;
return cmd_log_wc(argc, argv, envp, &rev); cmd_log_init(argc, argv, envp, &rev);
return cmd_log_walk(&rev);
} }
static int istitlechar(char c) static int istitlechar(char c)