@matheusbsbs / matheus-bagliano / commits / 9dafea2678
Fork 0

whatchanged: Default to DIFF_FORMAT_RAW

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>

Timo Hirvonen committed Jun 25, 2006 at 15:39 UTC 9dafea267806988d7f5821780de688ca84766a40
1 file changed +16 -11
builtin-log.c
+16 -11
@@ -14,22 +14,22 @@
14 /* this is in builtin-diff.c */
15 void add_head(struct rev_info *revs);
16
17 -static int cmd_log_wc(int argc, const char **argv, char **envp,
17 +static void cmd_log_init(int argc, const char **argv, char **envp,
18 struct rev_info *rev)
19 {
20 - struct commit *commit;
21 -
20 rev->abbrev = DEFAULT_ABBREV;
21 rev->commit_format = CMIT_FMT_DEFAULT;
22 rev->verbose_header = 1;
23 argc = setup_revisions(argc, argv, rev, "HEAD");
26 - if (rev->always_show_header) {
27 - if (rev->diffopt.pickaxe || rev->diffopt.filter)
28 - rev->always_show_header = 0;
29 - }
30 -
24 + if (rev->diffopt.pickaxe || rev->diffopt.filter)
25 + rev->always_show_header = 0;
26 if (argc > 1)
27 die("unrecognized argument: %s", argv[1]);
28 +}
29 +
30 +static int cmd_log_walk(struct rev_info *rev)
31 +{
32 + struct commit *commit;
33
34 prepare_revision_walk(rev);
35 setup_pager();
@@ -51,7 +51,10 @@ int cmd_whatchanged(int argc, const char **argv, char **envp)
51 rev.diff = 1;
52 rev.diffopt.recursive = 1;
53 rev.simplify_history = 0;
54 - return cmd_log_wc(argc, argv, envp, &rev);
54 + cmd_log_init(argc, argv, envp, &rev);
55 + if (!rev.diffopt.output_format)
56 + rev.diffopt.output_format = DIFF_FORMAT_RAW;
57 + return cmd_log_walk(&rev);
58 }
59
60 int cmd_show(int argc, const char **argv, char **envp)
@@ -66,7 +69,8 @@ int cmd_show(int argc, const char **argv, char **envp)
69 rev.always_show_header = 1;
70 rev.ignore_merges = 0;
71 rev.no_walk = 1;
69 - return cmd_log_wc(argc, argv, envp, &rev);
72 + cmd_log_init(argc, argv, envp, &rev);
73 + return cmd_log_walk(&rev);
74 }
75
76 int cmd_log(int argc, const char **argv, char **envp)
@@ -76,7 +80,8 @@ int cmd_log(int argc, const char **argv, char **envp)
80 init_revisions(&rev);
81 rev.always_show_header = 1;
82 rev.diffopt.recursive = 1;
79 - return cmd_log_wc(argc, argv, envp, &rev);
83 + cmd_log_init(argc, argv, envp, &rev);
84 + return cmd_log_walk(&rev);
85 }
86
87 static int istitlechar(char c)