]> git.ipfire.org Git - thirdparty/git.git/blame - builtin-rev-list.c
git-rev-list: add --bisect-vars option.
[thirdparty/git.git] / builtin-rev-list.c
CommitLineData
64745109 1#include "cache.h"
e091eb93 2#include "refs.h"
36f8d174 3#include "tag.h"
64745109 4#include "commit.h"
9de48752
LT
5#include "tree.h"
6#include "blob.h"
1b0c7174 7#include "tree-walk.h"
c4e05b1a 8#include "diff.h"
ae563542 9#include "revision.h"
c64ed70d 10#include "list-objects.h"
5fb61b8d 11#include "builtin.h"
ae563542 12
1b65a5aa 13/* bits #0-15 in revision.h */
64745109 14
1b65a5aa 15#define COUNTED (1u<<16)
8906300f 16
a6f68d47 17static const char rev_list_usage[] =
69e0c256
JH
18"git-rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
19" limiting output:\n"
20" --max-count=nr\n"
21" --max-age=epoch\n"
22" --min-age=epoch\n"
23" --sparse\n"
24" --no-merges\n"
93b74bca 25" --remove-empty\n"
69e0c256 26" --all\n"
42cabc34 27" --stdin\n"
69e0c256 28" ordering output:\n"
69e0c256 29" --topo-order\n"
4c8725f1 30" --date-order\n"
69e0c256
JH
31" formatting output:\n"
32" --parents\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"
69e0c256 38" special purpose:\n"
457f08a0
JH
39" --bisect\n"
40" --bisect-vars"
69e0c256 41;
a6f68d47 42
5fb61b8d 43static struct rev_info revs;
ae563542 44
96f1e58f
DR
45static int bisect_list;
46static int show_timestamp;
47static int hdr_termination;
91539833 48static const char *header_prefix;
e646de0d 49
81f2bb1f
LT
50static void show_commit(struct commit *commit)
51{
dc68c4ff
JH
52 if (show_timestamp)
53 printf("%lu ", commit->date);
91539833
LT
54 if (header_prefix)
55 fputs(header_prefix, stdout);
384e99a4
JH
56 if (commit->object.flags & BOUNDARY)
57 putchar('-');
74bd9029 58 else if (revs.left_right) {
577ed5c2
JH
59 if (commit->object.flags & SYMMETRIC_LEFT)
60 putchar('<');
61 else
62 putchar('>');
63 }
7594c4b2
JH
64 if (revs.abbrev_commit && revs.abbrev)
65 fputs(find_unique_abbrev(commit->object.sha1, revs.abbrev),
66 stdout);
5c51c985
JH
67 else
68 fputs(sha1_to_hex(commit->object.sha1), stdout);
7b0c9966 69 if (revs.parents) {
81f2bb1f
LT
70 struct commit_list *parents = commit->parents;
71 while (parents) {
88494423 72 struct object *o = &(parents->item->object);
81f2bb1f 73 parents = parents->next;
88494423
JH
74 if (o->flags & TMP_MARK)
75 continue;
76 printf(" %s", sha1_to_hex(o->sha1));
77 o->flags |= TMP_MARK;
81f2bb1f 78 }
88494423
JH
79 /* TMP_MARK is a general purpose flag that can
80 * be used locally, but the user should clean
81 * things up after it is done with them.
82 */
83 for (parents = commit->parents;
84 parents;
85 parents = parents->next)
86 parents->item->object.flags &= ~TMP_MARK;
81f2bb1f 87 }
7594c4b2 88 if (revs.commit_format == CMIT_FMT_ONELINE)
d87449c5
JH
89 putchar(' ');
90 else
91 putchar('\n');
92
7594c4b2 93 if (revs.verbose_header) {
000182ea 94 static char pretty_header[16384];
7594c4b2
JH
95 pretty_print_commit(revs.commit_format, commit, ~0,
96 pretty_header, sizeof(pretty_header),
3dfb9278 97 revs.abbrev, NULL, NULL, revs.relative_date);
000182ea 98 printf("%s%c", pretty_header, hdr_termination);
7620d39f
LT
99 }
100 fflush(stdout);
cb115748
LT
101 if (commit->parents) {
102 free_commit_list(commit->parents);
103 commit->parents = NULL;
104 }
4cac42b1
JH
105 free(commit->buffer);
106 commit->buffer = NULL;
a3437b8c
JS
107}
108
c64ed70d 109static void show_object(struct object_array_entry *p)
9de48752 110{
c64ed70d
JH
111 /* An object with name "foo\n0000000..." can be used to
112 * confuse downstream git-pack-objects very badly.
113 */
114 const char *ep = strchr(p->name, '\n');
115 if (ep) {
116 printf("%s %.*s\n", sha1_to_hex(p->item->sha1),
117 (int) (ep - p->name),
118 p->name);
9de48752 119 }
c64ed70d
JH
120 else
121 printf("%s %s\n", sha1_to_hex(p->item->sha1), p->name);
9de48752
LT
122}
123
8d1d8f83
JH
124static void show_edge(struct commit *commit)
125{
126 printf("-%s\n", sha1_to_hex(commit->object.sha1));
127}
128
8b3a1e05
LT
129/*
130 * This is a truly stupid algorithm, but it's only
131 * used for bisection, and we just don't care enough.
132 *
133 * We care just barely enough to avoid recursing for
134 * non-merge entries.
135 */
136static int count_distance(struct commit_list *entry)
137{
138 int nr = 0;
139
140 while (entry) {
141 struct commit *commit = entry->item;
142 struct commit_list *p;
143
144 if (commit->object.flags & (UNINTERESTING | COUNTED))
145 break;
8efdc326 146 if (!revs.prune_fn || (commit->object.flags & TREECHANGE))
b3cfd939 147 nr++;
8b3a1e05
LT
148 commit->object.flags |= COUNTED;
149 p = commit->parents;
150 entry = p;
151 if (p) {
152 p = p->next;
153 while (p) {
154 nr += count_distance(p);
155 p = p->next;
156 }
157 }
158 }
b3cfd939 159
8b3a1e05
LT
160 return nr;
161}
162
3d958064 163static void clear_distance(struct commit_list *list)
8b3a1e05
LT
164{
165 while (list) {
166 struct commit *commit = list->item;
167 commit->object.flags &= ~COUNTED;
168 list = list->next;
169 }
170}
171
457f08a0
JH
172static struct commit_list *find_bisection(struct commit_list *list,
173 int *reaches, int *all)
8b3a1e05
LT
174{
175 int nr, closest;
176 struct commit_list *p, *best;
177
178 nr = 0;
179 p = list;
180 while (p) {
8efdc326 181 if (!revs.prune_fn || (p->item->object.flags & TREECHANGE))
b3cfd939 182 nr++;
8b3a1e05
LT
183 p = p->next;
184 }
457f08a0 185 *all = nr;
8b3a1e05
LT
186 closest = 0;
187 best = list;
188
b3cfd939 189 for (p = list; p; p = p->next) {
457f08a0 190 int distance, reach;
b3cfd939 191
8efdc326 192 if (revs.prune_fn && !(p->item->object.flags & TREECHANGE))
b3cfd939
LT
193 continue;
194
457f08a0 195 distance = reach = count_distance(p);
8b3a1e05
LT
196 clear_distance(list);
197 if (nr - distance < distance)
198 distance = nr - distance;
199 if (distance > closest) {
200 best = p;
457f08a0 201 *reaches = reach;
8b3a1e05
LT
202 closest = distance;
203 }
8b3a1e05
LT
204 }
205 if (best)
206 best->next = NULL;
207 return best;
208}
209
42cabc34
JH
210static void read_revisions_from_stdin(struct rev_info *revs)
211{
212 char line[1000];
213
214 while (fgets(line, sizeof(line), stdin) != NULL) {
215 int len = strlen(line);
216 if (line[len - 1] == '\n')
217 line[--len] = 0;
218 if (!len)
219 break;
220 if (line[0] == '-')
221 die("options not supported in --stdin mode");
222 if (handle_revision_arg(line, revs, 0, 1))
223 die("bad revision '%s'", line);
224 }
225}
226
a633fca0 227int cmd_rev_list(int argc, const char **argv, const char *prefix)
64745109 228{
ae563542 229 struct commit_list *list;
d9a83684 230 int i;
42cabc34 231 int read_from_stdin = 0;
457f08a0 232 int bisect_show_vars = 0;
64745109 233
256c3fe6 234 git_config(git_default_config);
a633fca0 235 init_revisions(&revs, prefix);
7594c4b2
JH
236 revs.abbrev = 0;
237 revs.commit_format = CMIT_FMT_UNSPECIFIED;
a4a88b2b 238 argc = setup_revisions(argc, argv, &revs, NULL);
ae563542 239
fcfda02b 240 for (i = 1 ; i < argc; i++) {
cf484544 241 const char *arg = argv[i];
fcfda02b 242
a6f68d47 243 if (!strcmp(arg, "--header")) {
7594c4b2 244 revs.verbose_header = 1;
9d97aa64
LT
245 continue;
246 }
dc68c4ff
JH
247 if (!strcmp(arg, "--timestamp")) {
248 show_timestamp = 1;
249 continue;
250 }
8b3a1e05
LT
251 if (!strcmp(arg, "--bisect")) {
252 bisect_list = 1;
253 continue;
254 }
457f08a0
JH
255 if (!strcmp(arg, "--bisect-vars")) {
256 bisect_list = 1;
257 bisect_show_vars = 1;
258 continue;
259 }
42cabc34
JH
260 if (!strcmp(arg, "--stdin")) {
261 if (read_from_stdin++)
262 die("--stdin given twice?");
263 read_revisions_from_stdin(&revs);
264 continue;
265 }
ae563542 266 usage(rev_list_usage);
a6f68d47 267
fcfda02b 268 }
7594c4b2
JH
269 if (revs.commit_format != CMIT_FMT_UNSPECIFIED) {
270 /* The command line has a --pretty */
271 hdr_termination = '\n';
272 if (revs.commit_format == CMIT_FMT_ONELINE)
91539833 273 header_prefix = "";
7594c4b2 274 else
91539833 275 header_prefix = "commit ";
7594c4b2 276 }
db89665f
JH
277 else if (revs.verbose_header)
278 /* Only --header was specified */
279 revs.commit_format = CMIT_FMT_RAW;
fcfda02b 280
ae563542 281 list = revs.commits;
ae563542 282
8c1f0b44
JH
283 if ((!list &&
284 (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&
1f1e895f 285 !revs.pending.nr)) ||
8c1f0b44 286 revs.diff)
7b34c2fa
LT
287 usage(rev_list_usage);
288
2d10c555 289 save_commit_buffer = revs.verbose_header || revs.grep_filter;
9181ca2c 290 track_object_refs = 0;
4e1dc640
JH
291 if (bisect_list)
292 revs.limited = 1;
9181ca2c 293
a4a88b2b
LT
294 prepare_revision_walk(&revs);
295 if (revs.tree_objects)
8d1d8f83 296 mark_edges_uninteresting(revs.commits, &revs, show_edge);
a4a88b2b 297
457f08a0
JH
298 if (bisect_list) {
299 int reaches = reaches, all = all;
300
301 revs.commits = find_bisection(revs.commits,
302 &reaches, &all);
303 if (bisect_show_vars) {
304 int cnt;
305 if (!revs.commits)
306 return 1;
307 /*
308 * revs.commits can reach "reaches" commits among
309 * "all" commits. If it is good, then there are
310 * (all-reaches) commits left to be bisected.
311 * On the other hand, if it is bad, then the set
312 * to bisect is "reaches".
313 * A bisect set of size N has (N-1) commits further
314 * to test, as we already know one bad one.
315 */
316 cnt = all-reaches;
317 if (cnt < reaches)
318 cnt = reaches;
319 printf("bisect_rev=%s\n"
320 "bisect_nr=%d\n"
321 "bisect_good=%d\n"
322 "bisect_bad=%d\n"
323 "bisect_all=%d\n",
324 sha1_to_hex(revs.commits->item->object.sha1),
325 cnt - 1,
326 all - reaches - 1,
327 reaches - 1,
328 all);
329 return 0;
330 }
331 }
7b34c2fa 332
c64ed70d 333 traverse_commit_list(&revs, show_commit, show_object);
8906300f 334
64745109
LT
335 return 0;
336}