]>
Commit | Line | Data |
---|---|---|
64745109 LT |
1 | #include "cache.h" |
2 | #include "commit.h" | |
c4e05b1a | 3 | #include "diff.h" |
ae563542 | 4 | #include "revision.h" |
c64ed70d | 5 | #include "list-objects.h" |
5fb61b8d | 6 | #include "builtin.h" |
50e62a8e | 7 | #include "log-tree.h" |
7fefda5c | 8 | #include "graph.h" |
a2ad79ce | 9 | #include "bisect.h" |
8906300f | 10 | |
a6f68d47 | 11 | static const char rev_list_usage[] = |
1b1dd23f | 12 | "git rev-list [OPTION] <commit-id>... [ -- paths... ]\n" |
69e0c256 | 13 | " limiting output:\n" |
62b4698e ŠN |
14 | " --max-count=<n>\n" |
15 | " --max-age=<epoch>\n" | |
16 | " --min-age=<epoch>\n" | |
69e0c256 JH |
17 | " --sparse\n" |
18 | " --no-merges\n" | |
ad5aeede MG |
19 | " --min-parents=<n>\n" |
20 | " --no-min-parents\n" | |
21 | " --max-parents=<n>\n" | |
22 | " --no-max-parents\n" | |
93b74bca | 23 | " --remove-empty\n" |
69e0c256 | 24 | " --all\n" |
a5aa930d UKK |
25 | " --branches\n" |
26 | " --tags\n" | |
27 | " --remotes\n" | |
42cabc34 | 28 | " --stdin\n" |
27350891 | 29 | " --quiet\n" |
69e0c256 | 30 | " ordering output:\n" |
69e0c256 | 31 | " --topo-order\n" |
4c8725f1 | 32 | " --date-order\n" |
7ccd3667 | 33 | " --reverse\n" |
69e0c256 JH |
34 | " formatting output:\n" |
35 | " --parents\n" | |
72276a3e | 36 | " --children\n" |
c6496575 | 37 | " --objects | --objects-edge\n" |
69e0c256 JH |
38 | " --unpacked\n" |
39 | " --header | --pretty\n" | |
62b4698e | 40 | " --abbrev=<n> | --no-abbrev\n" |
5c51c985 | 41 | " --abbrev-commit\n" |
b24bace5 | 42 | " --left-right\n" |
69e0c256 | 43 | " special purpose:\n" |
457f08a0 | 44 | " --bisect\n" |
50e62a8e CC |
45 | " --bisect-vars\n" |
46 | " --bisect-all" | |
69e0c256 | 47 | ; |
a6f68d47 | 48 | |
11c211fa CC |
49 | static void finish_commit(struct commit *commit, void *data); |
50 | static void show_commit(struct commit *commit, void *data) | |
81f2bb1f | 51 | { |
d797257e CC |
52 | struct rev_list_info *info = data; |
53 | struct rev_info *revs = info->revs; | |
11c211fa | 54 | |
98993722 NTND |
55 | if (info->flags & REV_LIST_QUIET) { |
56 | finish_commit(commit, data); | |
57 | return; | |
58 | } | |
59 | ||
11c211fa | 60 | graph_show_commit(revs->graph); |
7fefda5c | 61 | |
f69c5018 | 62 | if (revs->count) { |
b388e14b MG |
63 | if (commit->object.flags & PATCHSAME) |
64 | revs->count_same++; | |
65 | else if (commit->object.flags & SYMMETRIC_LEFT) | |
f69c5018 TR |
66 | revs->count_left++; |
67 | else | |
68 | revs->count_right++; | |
69 | finish_commit(commit, data); | |
70 | return; | |
71 | } | |
72 | ||
d797257e | 73 | if (info->show_timestamp) |
dc68c4ff | 74 | printf("%lu ", commit->date); |
d797257e CC |
75 | if (info->header_prefix) |
76 | fputs(info->header_prefix, stdout); | |
7528f27d | 77 | |
1df2d656 MG |
78 | if (!revs->graph) |
79 | fputs(get_revision_mark(revs, commit), stdout); | |
11c211fa CC |
80 | if (revs->abbrev_commit && revs->abbrev) |
81 | fputs(find_unique_abbrev(commit->object.sha1, revs->abbrev), | |
7594c4b2 | 82 | stdout); |
5c51c985 JH |
83 | else |
84 | fputs(sha1_to_hex(commit->object.sha1), stdout); | |
11c211fa | 85 | if (revs->print_parents) { |
81f2bb1f LT |
86 | struct commit_list *parents = commit->parents; |
87 | while (parents) { | |
1ed84157 | 88 | printf(" %s", sha1_to_hex(parents->item->object.sha1)); |
81f2bb1f LT |
89 | parents = parents->next; |
90 | } | |
91 | } | |
11c211fa | 92 | if (revs->children.name) { |
72276a3e JH |
93 | struct commit_list *children; |
94 | ||
11c211fa | 95 | children = lookup_decoration(&revs->children, &commit->object); |
72276a3e JH |
96 | while (children) { |
97 | printf(" %s", sha1_to_hex(children->item->object.sha1)); | |
98 | children = children->next; | |
99 | } | |
100 | } | |
11c211fa CC |
101 | show_decorations(revs, commit); |
102 | if (revs->commit_format == CMIT_FMT_ONELINE) | |
d87449c5 JH |
103 | putchar(' '); |
104 | else | |
105 | putchar('\n'); | |
106 | ||
11c211fa | 107 | if (revs->verbose_header && commit->buffer) { |
f285a2d7 | 108 | struct strbuf buf = STRBUF_INIT; |
dd2e794a TR |
109 | struct pretty_print_context ctx = {0}; |
110 | ctx.abbrev = revs->abbrev; | |
111 | ctx.date_mode = revs->date_mode; | |
f026c756 | 112 | ctx.date_mode_explicit = revs->date_mode_explicit; |
6bf13944 JK |
113 | ctx.fmt = revs->commit_format; |
114 | pretty_print_commit(&ctx, commit, &buf); | |
11c211fa | 115 | if (revs->graph) { |
7fefda5c | 116 | if (buf.len) { |
11c211fa CC |
117 | if (revs->commit_format != CMIT_FMT_ONELINE) |
118 | graph_show_oneline(revs->graph); | |
7fefda5c | 119 | |
11c211fa | 120 | graph_show_commit_msg(revs->graph, &buf); |
7fefda5c AS |
121 | |
122 | /* | |
123 | * Add a newline after the commit message. | |
124 | * | |
125 | * Usually, this newline produces a blank | |
126 | * padding line between entries, in which case | |
127 | * we need to add graph padding on this line. | |
128 | * | |
129 | * However, the commit message may not end in a | |
130 | * newline. In this case the newline simply | |
131 | * ends the last line of the commit message, | |
132 | * and we don't need any graph output. (This | |
133 | * always happens with CMIT_FMT_ONELINE, and it | |
134 | * happens with CMIT_FMT_USERFORMAT when the | |
135 | * format doesn't explicitly end in a newline.) | |
136 | */ | |
137 | if (buf.len && buf.buf[buf.len - 1] == '\n') | |
11c211fa | 138 | graph_show_padding(revs->graph); |
7fefda5c AS |
139 | putchar('\n'); |
140 | } else { | |
141 | /* | |
142 | * If the message buffer is empty, just show | |
143 | * the rest of the graph output for this | |
144 | * commit. | |
145 | */ | |
11c211fa | 146 | if (graph_show_remainder(revs->graph)) |
7fefda5c | 147 | putchar('\n'); |
1fb5fdd2 EFL |
148 | if (revs->commit_format == CMIT_FMT_ONELINE) |
149 | putchar('\n'); | |
7fefda5c AS |
150 | } |
151 | } else { | |
1fb5fdd2 | 152 | if (revs->commit_format != CMIT_FMT_USERFORMAT || |
9130ac9f JK |
153 | buf.len) { |
154 | fwrite(buf.buf, 1, buf.len, stdout); | |
155 | putchar(info->hdr_termination); | |
156 | } | |
7fefda5c | 157 | } |
674d1727 | 158 | strbuf_release(&buf); |
7fefda5c | 159 | } else { |
11c211fa | 160 | if (graph_show_remainder(revs->graph)) |
7fefda5c | 161 | putchar('\n'); |
7620d39f | 162 | } |
06f59e9f | 163 | maybe_flush_or_die(stdout, "stdout"); |
11c211fa | 164 | finish_commit(commit, data); |
27350891 SP |
165 | } |
166 | ||
11c211fa | 167 | static void finish_commit(struct commit *commit, void *data) |
27350891 | 168 | { |
cb115748 LT |
169 | if (commit->parents) { |
170 | free_commit_list(commit->parents); | |
171 | commit->parents = NULL; | |
172 | } | |
4cac42b1 JH |
173 | free(commit->buffer); |
174 | commit->buffer = NULL; | |
a3437b8c JS |
175 | } |
176 | ||
49473672 JH |
177 | static void finish_object(struct object *obj, |
178 | const struct name_path *path, const char *name, | |
179 | void *cb_data) | |
27350891 | 180 | { |
98993722 | 181 | struct rev_list_info *info = cb_data; |
8d2dfc49 LT |
182 | if (obj->type == OBJ_BLOB && !has_sha1_file(obj->sha1)) |
183 | die("missing blob object '%s'", sha1_to_hex(obj->sha1)); | |
98993722 NTND |
184 | if (info->revs->verify_objects && !obj->parsed && obj->type != OBJ_COMMIT) |
185 | parse_object(obj->sha1); | |
27350891 SP |
186 | } |
187 | ||
49473672 JH |
188 | static void show_object(struct object *obj, |
189 | const struct name_path *path, const char *component, | |
190 | void *cb_data) | |
9de48752 | 191 | { |
cb8da705 | 192 | struct rev_list_info *info = cb_data; |
49473672 | 193 | finish_object(obj, path, component, cb_data); |
98993722 NTND |
194 | if (info->flags & REV_LIST_QUIET) |
195 | return; | |
91f17516 | 196 | show_object_with_name(stdout, obj, path, component); |
9de48752 LT |
197 | } |
198 | ||
8d1d8f83 JH |
199 | static void show_edge(struct commit *commit) |
200 | { | |
201 | printf("-%s\n", sha1_to_hex(commit->object.sha1)); | |
202 | } | |
203 | ||
38ef7507 | 204 | static void print_var_str(const char *var, const char *val) |
280e65cb | 205 | { |
38ef7507 | 206 | printf("%s='%s'\n", var, val); |
280e65cb CC |
207 | } |
208 | ||
38ef7507 | 209 | static void print_var_int(const char *var, int val) |
280e65cb | 210 | { |
38ef7507 | 211 | printf("%s=%d\n", var, val); |
280e65cb CC |
212 | } |
213 | ||
f1c92c63 | 214 | static int show_bisect_vars(struct rev_list_info *info, int reaches, int all) |
9996983c | 215 | { |
98993722 | 216 | int cnt, flags = info->flags; |
280e65cb | 217 | char hex[41] = ""; |
95188648 | 218 | struct commit_list *tried; |
d797257e | 219 | struct rev_info *revs = info->revs; |
9996983c | 220 | |
8ba8fe04 | 221 | if (!revs->commits) |
9996983c CC |
222 | return 1; |
223 | ||
9af3589e CC |
224 | revs->commits = filter_skipped(revs->commits, &tried, |
225 | flags & BISECT_SHOW_ALL, | |
226 | NULL, NULL); | |
95188648 | 227 | |
9996983c | 228 | /* |
7428d754 | 229 | * revs->commits can reach "reaches" commits among |
9996983c CC |
230 | * "all" commits. If it is good, then there are |
231 | * (all-reaches) commits left to be bisected. | |
232 | * On the other hand, if it is bad, then the set | |
233 | * to bisect is "reaches". | |
234 | * A bisect set of size N has (N-1) commits further | |
235 | * to test, as we already know one bad one. | |
236 | */ | |
237 | cnt = all - reaches; | |
238 | if (cnt < reaches) | |
239 | cnt = reaches; | |
6a17fad7 | 240 | |
95188648 CC |
241 | if (revs->commits) |
242 | strcpy(hex, sha1_to_hex(revs->commits->item->object.sha1)); | |
9996983c | 243 | |
37c4c38d | 244 | if (flags & BISECT_SHOW_ALL) { |
d797257e | 245 | traverse_commit_list(revs, show_commit, show_object, info); |
9996983c CC |
246 | printf("------\n"); |
247 | } | |
248 | ||
38ef7507 CC |
249 | print_var_str("bisect_rev", hex); |
250 | print_var_int("bisect_nr", cnt - 1); | |
251 | print_var_int("bisect_good", all - reaches - 1); | |
252 | print_var_int("bisect_bad", reaches - 1); | |
253 | print_var_int("bisect_all", all); | |
254 | print_var_int("bisect_steps", estimate_bisect_steps(all)); | |
9996983c CC |
255 | |
256 | return 0; | |
257 | } | |
258 | ||
a633fca0 | 259 | int cmd_rev_list(int argc, const char **argv, const char *prefix) |
64745109 | 260 | { |
11c211fa | 261 | struct rev_info revs; |
d797257e | 262 | struct rev_list_info info; |
d9a83684 | 263 | int i; |
ff62d732 | 264 | int bisect_list = 0; |
457f08a0 | 265 | int bisect_show_vars = 0; |
50e62a8e | 266 | int bisect_find_all = 0; |
64745109 | 267 | |
ef90d6d4 | 268 | git_config(git_default_config, NULL); |
a633fca0 | 269 | init_revisions(&revs, prefix); |
7337b138 | 270 | revs.abbrev = DEFAULT_ABBREV; |
7594c4b2 | 271 | revs.commit_format = CMIT_FMT_UNSPECIFIED; |
a4a88b2b | 272 | argc = setup_revisions(argc, argv, &revs, NULL); |
ae563542 | 273 | |
d797257e CC |
274 | memset(&info, 0, sizeof(info)); |
275 | info.revs = &revs; | |
ad3f9a71 LT |
276 | if (revs.bisect) |
277 | bisect_list = 1; | |
d797257e | 278 | |
98993722 NTND |
279 | if (DIFF_OPT_TST(&revs.diffopt, QUICK)) |
280 | info.flags |= REV_LIST_QUIET; | |
fcfda02b | 281 | for (i = 1 ; i < argc; i++) { |
cf484544 | 282 | const char *arg = argv[i]; |
fcfda02b | 283 | |
a6f68d47 | 284 | if (!strcmp(arg, "--header")) { |
7594c4b2 | 285 | revs.verbose_header = 1; |
9d97aa64 LT |
286 | continue; |
287 | } | |
dc68c4ff | 288 | if (!strcmp(arg, "--timestamp")) { |
d797257e | 289 | info.show_timestamp = 1; |
dc68c4ff JH |
290 | continue; |
291 | } | |
8b3a1e05 LT |
292 | if (!strcmp(arg, "--bisect")) { |
293 | bisect_list = 1; | |
294 | continue; | |
295 | } | |
50e62a8e CC |
296 | if (!strcmp(arg, "--bisect-all")) { |
297 | bisect_list = 1; | |
298 | bisect_find_all = 1; | |
98993722 | 299 | info.flags |= BISECT_SHOW_ALL; |
6e46cc0d | 300 | revs.show_decorations = 1; |
50e62a8e CC |
301 | continue; |
302 | } | |
457f08a0 JH |
303 | if (!strcmp(arg, "--bisect-vars")) { |
304 | bisect_list = 1; | |
305 | bisect_show_vars = 1; | |
306 | continue; | |
307 | } | |
ae563542 | 308 | usage(rev_list_usage); |
a6f68d47 | 309 | |
fcfda02b | 310 | } |
7594c4b2 JH |
311 | if (revs.commit_format != CMIT_FMT_UNSPECIFIED) { |
312 | /* The command line has a --pretty */ | |
d797257e | 313 | info.hdr_termination = '\n'; |
7594c4b2 | 314 | if (revs.commit_format == CMIT_FMT_ONELINE) |
d797257e | 315 | info.header_prefix = ""; |
7594c4b2 | 316 | else |
d797257e | 317 | info.header_prefix = "commit "; |
7594c4b2 | 318 | } |
db89665f JH |
319 | else if (revs.verbose_header) |
320 | /* Only --header was specified */ | |
321 | revs.commit_format = CMIT_FMT_RAW; | |
fcfda02b | 322 | |
d797257e | 323 | if ((!revs.commits && |
8c1f0b44 | 324 | (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) && |
1f1e895f | 325 | !revs.pending.nr)) || |
8c1f0b44 | 326 | revs.diff) |
7b34c2fa LT |
327 | usage(rev_list_usage); |
328 | ||
80235ba7 JH |
329 | save_commit_buffer = (revs.verbose_header || |
330 | revs.grep_filter.pattern_list || | |
331 | revs.grep_filter.header_list); | |
4e1dc640 JH |
332 | if (bisect_list) |
333 | revs.limited = 1; | |
9181ca2c | 334 | |
3d51e1b5 MK |
335 | if (prepare_revision_walk(&revs)) |
336 | die("revision walk setup failed"); | |
a4a88b2b | 337 | if (revs.tree_objects) |
8d1d8f83 | 338 | mark_edges_uninteresting(revs.commits, &revs, show_edge); |
a4a88b2b | 339 | |
457f08a0 JH |
340 | if (bisect_list) { |
341 | int reaches = reaches, all = all; | |
342 | ||
50e62a8e CC |
343 | revs.commits = find_bisection(revs.commits, &reaches, &all, |
344 | bisect_find_all); | |
95188648 | 345 | |
9996983c | 346 | if (bisect_show_vars) |
13858e57 | 347 | return show_bisect_vars(&info, reaches, all); |
457f08a0 | 348 | } |
7b34c2fa | 349 | |
98993722 | 350 | traverse_commit_list(&revs, show_commit, show_object, &info); |
8906300f | 351 | |
f69c5018 | 352 | if (revs.count) { |
b388e14b MG |
353 | if (revs.left_right && revs.cherry_mark) |
354 | printf("%d\t%d\t%d\n", revs.count_left, revs.count_right, revs.count_same); | |
355 | else if (revs.left_right) | |
f69c5018 | 356 | printf("%d\t%d\n", revs.count_left, revs.count_right); |
b388e14b MG |
357 | else if (revs.cherry_mark) |
358 | printf("%d\t%d\n", revs.count_left + revs.count_right, revs.count_same); | |
f69c5018 TR |
359 | else |
360 | printf("%d\n", revs.count_left + revs.count_right); | |
361 | } | |
362 | ||
64745109 LT |
363 | return 0; |
364 | } |