]>
Commit | Line | Data |
---|---|---|
baffc0e7 | 1 | #include "builtin.h" |
6683463e | 2 | #include "cache.h" |
b2141fc1 | 3 | #include "config.h" |
b5039db6 | 4 | #include "commit.h" |
d96855ff JH |
5 | #include "refs.h" |
6 | #include "diff.h" | |
7 | #include "revision.h" | |
e5d1a4df | 8 | #include "parse-options.h" |
2122f675 | 9 | #include "repository.h" |
64043556 | 10 | #include "commit-reach.h" |
6683463e | 11 | |
53eda89b | 12 | static int show_merge_base(struct commit **rev, int rev_nr, int show_all) |
52cab8a0 | 13 | { |
a452d0f4 | 14 | struct commit_list *result, *r; |
53eda89b | 15 | |
2ce406cc | 16 | result = get_merge_bases_many_dirty(rev[0], rev_nr - 1, rev + 1); |
52cab8a0 JS |
17 | |
18 | if (!result) | |
19 | return 1; | |
20 | ||
a452d0f4 MÅ |
21 | for (r = result; r; r = r->next) { |
22 | printf("%s\n", oid_to_hex(&r->item->object.oid)); | |
9585e406 | 23 | if (!show_all) |
a452d0f4 | 24 | break; |
9585e406 | 25 | } |
52cab8a0 | 26 | |
a452d0f4 | 27 | free_commit_list(result); |
9585e406 | 28 | return 0; |
6683463e LT |
29 | } |
30 | ||
e5d1a4df | 31 | static const char * const merge_base_usage[] = { |
9c9b4f2f AH |
32 | N_("git merge-base [-a | --all] <commit> <commit>..."), |
33 | N_("git merge-base [-a | --all] --octopus <commit>..."), | |
f037dbf4 | 34 | N_("git merge-base --independent <commit>..."), |
34f5130a | 35 | N_("git merge-base --is-ancestor <commit> <commit>"), |
d96855ff | 36 | N_("git merge-base --fork-point <ref> [<commit>]"), |
e5d1a4df PH |
37 | NULL |
38 | }; | |
9585e406 | 39 | |
df57accb CC |
40 | static struct commit *get_commit_reference(const char *arg) |
41 | { | |
d0ae910a | 42 | struct object_id revkey; |
df57accb CC |
43 | struct commit *r; |
44 | ||
d0ae910a | 45 | if (get_oid(arg, &revkey)) |
df57accb | 46 | die("Not a valid object name %s", arg); |
2122f675 | 47 | r = lookup_commit_reference(the_repository, &revkey); |
df57accb CC |
48 | if (!r) |
49 | die("Not a valid commit name %s", arg); | |
50 | ||
51 | return r; | |
52 | } | |
53 | ||
e2f5df42 | 54 | static int handle_independent(int count, const char **args) |
aa8f98c1 | 55 | { |
a452d0f4 | 56 | struct commit_list *revs = NULL, *rev; |
aa8f98c1 JN |
57 | int i; |
58 | ||
e2f5df42 JH |
59 | for (i = count - 1; i >= 0; i--) |
60 | commit_list_insert(get_commit_reference(args[i]), &revs); | |
61 | ||
4da72644 | 62 | reduce_heads_replace(&revs); |
a452d0f4 MÅ |
63 | |
64 | if (!revs) | |
e2f5df42 JH |
65 | return 1; |
66 | ||
a452d0f4 MÅ |
67 | for (rev = revs; rev; rev = rev->next) |
68 | printf("%s\n", oid_to_hex(&rev->item->object.oid)); | |
69 | ||
70 | free_commit_list(revs); | |
e2f5df42 JH |
71 | return 0; |
72 | } | |
73 | ||
74 | static int handle_octopus(int count, const char **args, int show_all) | |
75 | { | |
76 | struct commit_list *revs = NULL; | |
a452d0f4 | 77 | struct commit_list *result, *rev; |
e2f5df42 | 78 | int i; |
a1e0ad78 JN |
79 | |
80 | for (i = count - 1; i >= 0; i--) | |
aa8f98c1 | 81 | commit_list_insert(get_commit_reference(args[i]), &revs); |
a1e0ad78 | 82 | |
4da72644 MÅ |
83 | result = get_octopus_merge_bases(revs); |
84 | free_commit_list(revs); | |
85 | reduce_heads_replace(&result); | |
aa8f98c1 JN |
86 | |
87 | if (!result) | |
88 | return 1; | |
89 | ||
a452d0f4 MÅ |
90 | for (rev = result; rev; rev = rev->next) { |
91 | printf("%s\n", oid_to_hex(&rev->item->object.oid)); | |
aa8f98c1 | 92 | if (!show_all) |
a452d0f4 | 93 | break; |
aa8f98c1 JN |
94 | } |
95 | ||
a452d0f4 | 96 | free_commit_list(result); |
aa8f98c1 JN |
97 | return 0; |
98 | } | |
99 | ||
5907cda1 JH |
100 | static int handle_is_ancestor(int argc, const char **argv) |
101 | { | |
102 | struct commit *one, *two; | |
103 | ||
104 | if (argc != 2) | |
105 | die("--is-ancestor takes exactly two commits"); | |
106 | one = get_commit_reference(argv[0]); | |
107 | two = get_commit_reference(argv[1]); | |
108 | if (in_merge_bases(one, two)) | |
109 | return 0; | |
110 | else | |
111 | return 1; | |
112 | } | |
113 | ||
d96855ff JH |
114 | struct rev_collect { |
115 | struct commit **commit; | |
116 | int nr; | |
117 | int alloc; | |
118 | unsigned int initial : 1; | |
119 | }; | |
120 | ||
d0ae910a | 121 | static void add_one_commit(struct object_id *oid, struct rev_collect *revs) |
d96855ff JH |
122 | { |
123 | struct commit *commit; | |
124 | ||
d0ae910a | 125 | if (is_null_oid(oid)) |
d96855ff JH |
126 | return; |
127 | ||
c1f5eb49 | 128 | commit = lookup_commit(the_repository, oid); |
d96855ff JH |
129 | if (!commit || |
130 | (commit->object.flags & TMP_MARK) || | |
131 | parse_commit(commit)) | |
132 | return; | |
133 | ||
134 | ALLOC_GROW(revs->commit, revs->nr + 1, revs->alloc); | |
135 | revs->commit[revs->nr++] = commit; | |
136 | commit->object.flags |= TMP_MARK; | |
137 | } | |
138 | ||
9461d272 | 139 | static int collect_one_reflog_ent(struct object_id *ooid, struct object_id *noid, |
dddbad72 | 140 | const char *ident, timestamp_t timestamp, |
d96855ff JH |
141 | int tz, const char *message, void *cbdata) |
142 | { | |
143 | struct rev_collect *revs = cbdata; | |
144 | ||
145 | if (revs->initial) { | |
146 | revs->initial = 0; | |
d0ae910a | 147 | add_one_commit(ooid, revs); |
d96855ff | 148 | } |
d0ae910a | 149 | add_one_commit(noid, revs); |
d96855ff JH |
150 | return 0; |
151 | } | |
152 | ||
153 | static int handle_fork_point(int argc, const char **argv) | |
154 | { | |
d0ae910a | 155 | struct object_id oid; |
d96855ff JH |
156 | char *refname; |
157 | const char *commitname; | |
158 | struct rev_collect revs; | |
159 | struct commit *derived; | |
160 | struct commit_list *bases; | |
161 | int i, ret = 0; | |
162 | ||
cca5fa64 | 163 | switch (dwim_ref(argv[0], strlen(argv[0]), &oid, &refname)) { |
d96855ff JH |
164 | case 0: |
165 | die("No such ref: '%s'", argv[0]); | |
166 | case 1: | |
167 | break; /* good */ | |
168 | default: | |
169 | die("Ambiguous refname: '%s'", argv[0]); | |
170 | } | |
171 | ||
172 | commitname = (argc == 2) ? argv[1] : "HEAD"; | |
d0ae910a | 173 | if (get_oid(commitname, &oid)) |
d96855ff JH |
174 | die("Not a valid object name: '%s'", commitname); |
175 | ||
2122f675 | 176 | derived = lookup_commit_reference(the_repository, &oid); |
d96855ff JH |
177 | memset(&revs, 0, sizeof(revs)); |
178 | revs.initial = 1; | |
179 | for_each_reflog_ent(refname, collect_one_reflog_ent, &revs); | |
180 | ||
d0ae910a | 181 | if (!revs.nr && !get_oid(refname, &oid)) |
182 | add_one_commit(&oid, &revs); | |
4f21454b | 183 | |
d96855ff JH |
184 | for (i = 0; i < revs.nr; i++) |
185 | revs.commit[i]->object.flags &= ~TMP_MARK; | |
186 | ||
2ce406cc | 187 | bases = get_merge_bases_many_dirty(derived, revs.nr, revs.commit); |
d96855ff JH |
188 | |
189 | /* | |
190 | * There should be one and only one merge base, when we found | |
191 | * a common ancestor among reflog entries. | |
192 | */ | |
193 | if (!bases || bases->next) { | |
194 | ret = 1; | |
195 | goto cleanup_return; | |
196 | } | |
197 | ||
198 | /* And the found one must be one of the reflog entries */ | |
199 | for (i = 0; i < revs.nr; i++) | |
200 | if (&bases->item->object == &revs.commit[i]->object) | |
201 | break; /* found */ | |
202 | if (revs.nr <= i) { | |
203 | ret = 1; /* not found */ | |
204 | goto cleanup_return; | |
205 | } | |
206 | ||
f2fd0760 | 207 | printf("%s\n", oid_to_hex(&bases->item->object.oid)); |
d96855ff JH |
208 | |
209 | cleanup_return: | |
210 | free_commit_list(bases); | |
211 | return ret; | |
212 | } | |
213 | ||
71dfbf22 | 214 | int cmd_merge_base(int argc, const char **argv, const char *prefix) |
6683463e | 215 | { |
53eda89b CC |
216 | struct commit **rev; |
217 | int rev_nr = 0; | |
71dfbf22 | 218 | int show_all = 0; |
16e57aec | 219 | int cmdmode = 0; |
6683463e | 220 | |
e5d1a4df | 221 | struct option options[] = { |
d5d09d47 | 222 | OPT_BOOL('a', "all", &show_all, N_("output all common ancestors")), |
16e57aec JH |
223 | OPT_CMDMODE(0, "octopus", &cmdmode, |
224 | N_("find ancestors for a single n-way merge"), 'o'), | |
225 | OPT_CMDMODE(0, "independent", &cmdmode, | |
226 | N_("list revs not reachable from others"), 'r'), | |
227 | OPT_CMDMODE(0, "is-ancestor", &cmdmode, | |
228 | N_("is the first one ancestor of the other?"), 'a'), | |
d96855ff JH |
229 | OPT_CMDMODE(0, "fork-point", &cmdmode, |
230 | N_("find where <commit> forked from reflog of <ref>"), 'f'), | |
e5d1a4df PH |
231 | OPT_END() |
232 | }; | |
53eda89b | 233 | |
e5d1a4df | 234 | git_config(git_default_config, NULL); |
37782920 | 235 | argc = parse_options(argc, argv, prefix, options, merge_base_usage, 0); |
16e57aec JH |
236 | |
237 | if (cmdmode == 'a') { | |
238 | if (argc < 2) | |
239 | usage_with_options(merge_base_usage, options); | |
240 | if (show_all) | |
241 | die("--is-ancestor cannot be used with --all"); | |
5907cda1 | 242 | return handle_is_ancestor(argc, argv); |
16e57aec | 243 | } |
aa8f98c1 | 244 | |
16e57aec JH |
245 | if (cmdmode == 'r' && show_all) |
246 | die("--independent cannot be used with --all"); | |
247 | ||
d5d1678b | 248 | if (cmdmode == 'o') |
e2f5df42 | 249 | return handle_octopus(argc, argv, show_all); |
d5d1678b JH |
250 | |
251 | if (cmdmode == 'r') | |
e2f5df42 | 252 | return handle_independent(argc, argv); |
16e57aec | 253 | |
d96855ff JH |
254 | if (cmdmode == 'f') { |
255 | if (argc < 1 || 2 < argc) | |
256 | usage_with_options(merge_base_usage, options); | |
257 | return handle_fork_point(argc, argv); | |
258 | } | |
259 | ||
16e57aec JH |
260 | if (argc < 2) |
261 | usage_with_options(merge_base_usage, options); | |
aa8f98c1 | 262 | |
b32fa95f | 263 | ALLOC_ARRAY(rev, argc); |
e5d1a4df PH |
264 | while (argc-- > 0) |
265 | rev[rev_nr++] = get_commit_reference(*argv++); | |
53eda89b | 266 | return show_merge_base(rev, rev_nr, show_all); |
6683463e | 267 | } |