Skip to content

Commit

Permalink
whatchanged: Default to DIFF_FORMAT_RAW
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
tihirvon authored and Junio C Hamano committed Jun 26, 2006
1 parent 5e2b063 commit 9dafea2
Showing 1 changed file with 16 additions and 11 deletions.
27 changes: 16 additions & 11 deletions builtin-log.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@
/* this is in builtin-diff.c */
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 commit *commit;

rev->abbrev = DEFAULT_ABBREV;
rev->commit_format = CMIT_FMT_DEFAULT;
rev->verbose_header = 1;
argc = setup_revisions(argc, argv, rev, "HEAD");
if (rev->always_show_header) {
if (rev->diffopt.pickaxe || rev->diffopt.filter)
rev->always_show_header = 0;
}

if (rev->diffopt.pickaxe || rev->diffopt.filter)
rev->always_show_header = 0;
if (argc > 1)
die("unrecognized argument: %s", argv[1]);
}

static int cmd_log_walk(struct rev_info *rev)
{
struct commit *commit;

prepare_revision_walk(rev);
setup_pager();
Expand All @@ -51,7 +51,10 @@ int cmd_whatchanged(int argc, const char **argv, char **envp)
rev.diff = 1;
rev.diffopt.recursive = 1;
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)
Expand All @@ -66,7 +69,8 @@ int cmd_show(int argc, const char **argv, char **envp)
rev.always_show_header = 1;
rev.ignore_merges = 0;
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)
Expand All @@ -76,7 +80,8 @@ int cmd_log(int argc, const char **argv, char **envp)
init_revisions(&rev);
rev.always_show_header = 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)
Expand Down

0 comments on commit 9dafea2

Please sign in to comment.