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