]>
Commit | Line | Data |
---|---|---|
d6b64ed0 | 1 | #include "builtin.h" |
bd321bcc JS |
2 | #include "cache.h" |
3 | #include "commit.h" | |
4 | #include "tag.h" | |
5 | #include "refs.h" | |
edefb1a2 | 6 | #include "parse-options.h" |
bd321bcc | 7 | |
c075aea5 JH |
8 | #define CUTOFF_DATE_SLOP 86400 /* one day */ |
9 | ||
bd321bcc JS |
10 | typedef struct rev_name { |
11 | const char *tip_name; | |
bd321bcc | 12 | int generation; |
ac076c29 | 13 | int distance; |
bd321bcc JS |
14 | } rev_name; |
15 | ||
16 | static long cutoff = LONG_MAX; | |
17 | ||
ac076c29 JS |
18 | /* How many generations are maximally preferred over _one_ merge traversal? */ |
19 | #define MERGE_TRAVERSAL_WEIGHT 65535 | |
20 | ||
bd321bcc | 21 | static void name_rev(struct commit *commit, |
ac076c29 | 22 | const char *tip_name, int generation, int distance, |
bd321bcc JS |
23 | int deref) |
24 | { | |
d3ff6f55 | 25 | struct rev_name *name = (struct rev_name *)commit->util; |
bd321bcc | 26 | struct commit_list *parents; |
f2e6f1c9 | 27 | int parent_number = 1; |
bd321bcc JS |
28 | |
29 | if (!commit->object.parsed) | |
30 | parse_commit(commit); | |
31 | ||
32 | if (commit->date < cutoff) | |
33 | return; | |
34 | ||
35 | if (deref) { | |
36 | char *new_name = xmalloc(strlen(tip_name)+3); | |
37 | strcpy(new_name, tip_name); | |
38 | strcat(new_name, "^0"); | |
39 | tip_name = new_name; | |
40 | ||
41 | if (generation) | |
42 | die("generation: %d, but deref?", generation); | |
43 | } | |
44 | ||
45 | if (name == NULL) { | |
46 | name = xmalloc(sizeof(rev_name)); | |
d3ff6f55 | 47 | commit->util = name; |
bd321bcc | 48 | goto copy_data; |
ac076c29 | 49 | } else if (name->distance > distance) { |
bd321bcc JS |
50 | copy_data: |
51 | name->tip_name = tip_name; | |
bd321bcc | 52 | name->generation = generation; |
ac076c29 | 53 | name->distance = distance; |
bd321bcc JS |
54 | } else |
55 | return; | |
56 | ||
57 | for (parents = commit->parents; | |
58 | parents; | |
59 | parents = parents->next, parent_number++) { | |
f2e6f1c9 | 60 | if (parent_number > 1) { |
59d3f541 | 61 | int len = strlen(tip_name); |
cf606e3d AW |
62 | char *new_name = xmalloc(len + |
63 | 1 + decimal_length(generation) + /* ~<n> */ | |
64 | 1 + 2 + /* ^NN */ | |
65 | 1); | |
bd321bcc | 66 | |
59d3f541 JS |
67 | if (len > 2 && !strcmp(tip_name + len - 2, "^0")) |
68 | len -= 2; | |
bd321bcc | 69 | if (generation > 0) |
59d3f541 | 70 | sprintf(new_name, "%.*s~%d^%d", len, tip_name, |
bd321bcc JS |
71 | generation, parent_number); |
72 | else | |
59d3f541 JS |
73 | sprintf(new_name, "%.*s^%d", len, tip_name, |
74 | parent_number); | |
bd321bcc | 75 | |
ac076c29 JS |
76 | name_rev(parents->item, new_name, 0, |
77 | distance + MERGE_TRAVERSAL_WEIGHT, 0); | |
bd321bcc | 78 | } else { |
ac076c29 JS |
79 | name_rev(parents->item, tip_name, generation + 1, |
80 | distance + 1, 0); | |
bd321bcc JS |
81 | } |
82 | } | |
83 | } | |
84 | ||
2afc29aa JS |
85 | struct name_ref_data { |
86 | int tags_only; | |
23615708 | 87 | int name_only; |
2afc29aa JS |
88 | const char *ref_filter; |
89 | }; | |
90 | ||
8da19775 | 91 | static int name_ref(const char *path, const unsigned char *sha1, int flags, void *cb_data) |
bd321bcc JS |
92 | { |
93 | struct object *o = parse_object(sha1); | |
2afc29aa | 94 | struct name_ref_data *data = cb_data; |
bd321bcc JS |
95 | int deref = 0; |
96 | ||
cc44c765 | 97 | if (data->tags_only && prefixcmp(path, "refs/tags/")) |
2afc29aa JS |
98 | return 0; |
99 | ||
100 | if (data->ref_filter && fnmatch(data->ref_filter, path, 0)) | |
bd321bcc JS |
101 | return 0; |
102 | ||
1974632c | 103 | while (o && o->type == OBJ_TAG) { |
bd321bcc JS |
104 | struct tag *t = (struct tag *) o; |
105 | if (!t->tagged) | |
106 | break; /* broken repository */ | |
107 | o = parse_object(t->tagged->sha1); | |
108 | deref = 1; | |
109 | } | |
1974632c | 110 | if (o && o->type == OBJ_COMMIT) { |
bd321bcc | 111 | struct commit *commit = (struct commit *)o; |
bd321bcc | 112 | |
cc44c765 | 113 | if (!prefixcmp(path, "refs/heads/")) |
2c817df2 | 114 | path = path + 11; |
23615708 SP |
115 | else if (data->tags_only |
116 | && data->name_only | |
117 | && !prefixcmp(path, "refs/tags/")) | |
118 | path = path + 10; | |
cc44c765 | 119 | else if (!prefixcmp(path, "refs/")) |
2c817df2 | 120 | path = path + 5; |
bd321bcc | 121 | |
9befac47 | 122 | name_rev(commit, xstrdup(path), 0, 0, deref); |
bd321bcc JS |
123 | } |
124 | return 0; | |
125 | } | |
126 | ||
127 | /* returns a static buffer */ | |
da2478db | 128 | static const char *get_rev_name(const struct object *o) |
bd321bcc JS |
129 | { |
130 | static char buffer[1024]; | |
d3ff6f55 LT |
131 | struct rev_name *n; |
132 | struct commit *c; | |
133 | ||
1974632c | 134 | if (o->type != OBJ_COMMIT) |
a2cf9f44 | 135 | return NULL; |
d3ff6f55 LT |
136 | c = (struct commit *) o; |
137 | n = c->util; | |
bd321bcc | 138 | if (!n) |
a2cf9f44 | 139 | return NULL; |
bd321bcc JS |
140 | |
141 | if (!n->generation) | |
142 | return n->tip_name; | |
59d3f541 JS |
143 | else { |
144 | int len = strlen(n->tip_name); | |
145 | if (len > 2 && !strcmp(n->tip_name + len - 2, "^0")) | |
146 | len -= 2; | |
147 | snprintf(buffer, sizeof(buffer), "%.*s~%d", len, n->tip_name, | |
148 | n->generation); | |
149 | ||
150 | return buffer; | |
151 | } | |
bd321bcc | 152 | } |
1f1e895f | 153 | |
da2478db JH |
154 | static void show_name(const struct object *obj, |
155 | const char *caller_name, | |
156 | int always, int allow_undefined, int name_only) | |
157 | { | |
158 | const char *name; | |
159 | const unsigned char *sha1 = obj->sha1; | |
160 | ||
161 | if (!name_only) | |
162 | printf("%s ", caller_name ? caller_name : sha1_to_hex(sha1)); | |
163 | name = get_rev_name(obj); | |
164 | if (name) | |
165 | printf("%s\n", name); | |
166 | else if (allow_undefined) | |
167 | printf("undefined\n"); | |
168 | else if (always) | |
169 | printf("%s\n", find_unique_abbrev(sha1, DEFAULT_ABBREV)); | |
170 | else | |
171 | die("cannot describe '%s'", sha1_to_hex(sha1)); | |
172 | } | |
173 | ||
edefb1a2 | 174 | static char const * const name_rev_usage[] = { |
1b1dd23f | 175 | "git name-rev [options] ( --all | --stdin | <commit>... )", |
edefb1a2 PH |
176 | NULL |
177 | }; | |
178 | ||
d6b64ed0 | 179 | int cmd_name_rev(int argc, const char **argv, const char *prefix) |
bd321bcc | 180 | { |
1f1e895f | 181 | struct object_array revs = { 0, 0, NULL }; |
da2478db | 182 | int all = 0, transform_stdin = 0, allow_undefined = 1, always = 0; |
23615708 | 183 | struct name_ref_data data = { 0, 0, NULL }; |
edefb1a2 PH |
184 | struct option opts[] = { |
185 | OPT_BOOLEAN(0, "name-only", &data.name_only, "print only names (no SHA-1)"), | |
186 | OPT_BOOLEAN(0, "tags", &data.tags_only, "only use tags to name the commits"), | |
187 | OPT_STRING(0, "refs", &data.ref_filter, "pattern", | |
188 | "only use refs matching <pattern>"), | |
189 | OPT_GROUP(""), | |
190 | OPT_BOOLEAN(0, "all", &all, "list all commits reachable from all refs"), | |
191 | OPT_BOOLEAN(0, "stdin", &transform_stdin, "read from stdin"), | |
a2cf9f44 | 192 | OPT_BOOLEAN(0, "undefined", &allow_undefined, "allow to print `undefined` names"), |
da2478db JH |
193 | OPT_BOOLEAN(0, "always", &always, |
194 | "show abbreviated commit object as fallback"), | |
edefb1a2 PH |
195 | OPT_END(), |
196 | }; | |
bd321bcc | 197 | |
ef90d6d4 | 198 | git_config(git_default_config, NULL); |
edefb1a2 PH |
199 | argc = parse_options(argc, argv, opts, name_rev_usage, 0); |
200 | if (!!all + !!transform_stdin + !!argc > 1) { | |
201 | error("Specify either a list, or --all, not both!"); | |
202 | usage_with_options(name_rev_usage, opts); | |
203 | } | |
204 | if (all || transform_stdin) | |
205 | cutoff = 0; | |
bd321bcc | 206 | |
edefb1a2 | 207 | for (; argc; argc--, argv++) { |
bd321bcc JS |
208 | unsigned char sha1[20]; |
209 | struct object *o; | |
210 | struct commit *commit; | |
211 | ||
bd321bcc JS |
212 | if (get_sha1(*argv, sha1)) { |
213 | fprintf(stderr, "Could not get sha1 for %s. Skipping.\n", | |
214 | *argv); | |
215 | continue; | |
216 | } | |
217 | ||
9534f40b | 218 | o = deref_tag(parse_object(sha1), *argv, 0); |
1974632c | 219 | if (!o || o->type != OBJ_COMMIT) { |
bd321bcc JS |
220 | fprintf(stderr, "Could not get commit for %s. Skipping.\n", |
221 | *argv); | |
222 | continue; | |
223 | } | |
224 | ||
225 | commit = (struct commit *)o; | |
bd321bcc JS |
226 | if (cutoff > commit->date) |
227 | cutoff = commit->date; | |
1f1e895f | 228 | add_object_array((struct object *)commit, *argv, &revs); |
bd321bcc JS |
229 | } |
230 | ||
c075aea5 JH |
231 | if (cutoff) |
232 | cutoff = cutoff - CUTOFF_DATE_SLOP; | |
2afc29aa | 233 | for_each_ref(name_ref, &data); |
bd321bcc JS |
234 | |
235 | if (transform_stdin) { | |
236 | char buffer[2048]; | |
237 | char *p, *p_start; | |
238 | ||
239 | while (!feof(stdin)) { | |
240 | int forty = 0; | |
241 | p = fgets(buffer, sizeof(buffer), stdin); | |
242 | if (!p) | |
243 | break; | |
244 | ||
245 | for (p_start = p; *p; p++) { | |
246 | #define ishex(x) (isdigit((x)) || ((x) >= 'a' && (x) <= 'f')) | |
247 | if (!ishex(*p)) | |
248 | forty = 0; | |
249 | else if (++forty == 40 && | |
250 | !ishex(*(p+1))) { | |
251 | unsigned char sha1[40]; | |
a2cf9f44 | 252 | const char *name = NULL; |
bd321bcc JS |
253 | char c = *(p+1); |
254 | ||
255 | forty = 0; | |
256 | ||
257 | *(p+1) = 0; | |
258 | if (!get_sha1(p - 39, sha1)) { | |
259 | struct object *o = | |
260 | lookup_object(sha1); | |
261 | if (o) | |
262 | name = get_rev_name(o); | |
263 | } | |
264 | *(p+1) = c; | |
265 | ||
a2cf9f44 | 266 | if (!name) |
bd321bcc JS |
267 | continue; |
268 | ||
a2cf9f44 | 269 | fwrite(p_start, p - p_start + 1, 1, stdout); |
2d76d0d1 | 270 | printf(" (%s)", name); |
bd321bcc JS |
271 | p_start = p + 1; |
272 | } | |
273 | } | |
274 | ||
275 | /* flush */ | |
276 | if (p_start != p) | |
277 | fwrite(p_start, p - p_start, 1, stdout); | |
278 | } | |
279 | } else if (all) { | |
fc046a75 | 280 | int i, max; |
bd321bcc | 281 | |
fc046a75 | 282 | max = get_max_object_index(); |
a83123de BS |
283 | for (i = 0; i < max; i++) { |
284 | struct object *obj = get_indexed_object(i); | |
285 | if (!obj) | |
286 | continue; | |
287 | show_name(obj, NULL, | |
da2478db | 288 | always, allow_undefined, data.name_only); |
a83123de | 289 | } |
1f1e895f LT |
290 | } else { |
291 | int i; | |
da2478db JH |
292 | for (i = 0; i < revs.nr; i++) |
293 | show_name(revs.objects[i].item, revs.objects[i].name, | |
294 | always, allow_undefined, data.name_only); | |
1f1e895f | 295 | } |
bd321bcc JS |
296 | |
297 | return 0; | |
298 | } |