5 #include "repository.h"
10 #include "parse-options.h"
11 #include "prio-queue.h"
12 #include "hash-lookup.h"
13 #include "commit-slab.h"
14 #include "commit-graph.h"
17 * One day. See the 'name a rev shortly after epoch' test in t6120 when
20 #define CUTOFF_DATE_SLOP 86400
24 timestamp_t taggerdate
;
30 define_commit_slab(commit_rev_name
, struct rev_name
);
32 static timestamp_t generation_cutoff
= GENERATION_NUMBER_INFINITY
;
33 static timestamp_t cutoff
= TIME_MAX
;
34 static struct commit_rev_name rev_names
;
36 /* Disable the cutoff checks entirely */
37 static void disable_cutoff(void)
39 generation_cutoff
= 0;
43 /* Cutoff searching any commits older than this one */
44 static void set_commit_cutoff(struct commit
*commit
)
47 if (cutoff
> commit
->date
)
48 cutoff
= commit
->date
;
50 if (generation_cutoff
) {
51 timestamp_t generation
= commit_graph_generation(commit
);
53 if (generation_cutoff
> generation
)
54 generation_cutoff
= generation
;
58 /* adjust the commit date cutoff with a slop to allow for slightly incorrect
59 * commit timestamps in case of clock skew.
61 static void adjust_cutoff_timestamp_for_slop(void)
64 /* check for undeflow */
65 if (cutoff
> TIME_MIN
+ CUTOFF_DATE_SLOP
)
66 cutoff
= cutoff
- CUTOFF_DATE_SLOP
;
72 /* Check if a commit is before the cutoff. Prioritize generation numbers
73 * first, but use the commit timestamp if we lack generation data.
75 static int commit_is_before_cutoff(struct commit
*commit
)
77 if (generation_cutoff
< GENERATION_NUMBER_INFINITY
)
78 return generation_cutoff
&&
79 commit_graph_generation(commit
) < generation_cutoff
;
81 return commit
->date
< cutoff
;
84 /* How many generations are maximally preferred over _one_ merge traversal? */
85 #define MERGE_TRAVERSAL_WEIGHT 65535
87 static int is_valid_rev_name(const struct rev_name
*name
)
89 return name
&& name
->tip_name
;
92 static struct rev_name
*get_commit_rev_name(const struct commit
*commit
)
94 struct rev_name
*name
= commit_rev_name_peek(&rev_names
, commit
);
96 return is_valid_rev_name(name
) ? name
: NULL
;
99 static int effective_distance(int distance
, int generation
)
101 return distance
+ (generation
> 0 ? MERGE_TRAVERSAL_WEIGHT
: 0);
104 static int is_better_name(struct rev_name
*name
,
105 timestamp_t taggerdate
,
110 int name_distance
= effective_distance(name
->distance
, name
->generation
);
111 int new_distance
= effective_distance(distance
, generation
);
113 /* If both are tags, we prefer the nearer one. */
114 if (from_tag
&& name
->from_tag
)
115 return name_distance
> new_distance
;
117 /* Favor a tag over a non-tag. */
118 if (name
->from_tag
!= from_tag
)
122 * We are now looking at two non-tags. Tiebreak to favor
125 if (name_distance
!= new_distance
)
126 return name_distance
> new_distance
;
128 /* ... or tiebreak to favor older date */
129 if (name
->taggerdate
!= taggerdate
)
130 return name
->taggerdate
> taggerdate
;
132 /* keep the current one if we cannot decide */
136 static struct rev_name
*create_or_update_name(struct commit
*commit
,
137 timestamp_t taggerdate
,
138 int generation
, int distance
,
141 struct rev_name
*name
= commit_rev_name_at(&rev_names
, commit
);
143 if (is_valid_rev_name(name
) &&
144 !is_better_name(name
, taggerdate
, generation
, distance
, from_tag
))
147 name
->taggerdate
= taggerdate
;
148 name
->generation
= generation
;
149 name
->distance
= distance
;
150 name
->from_tag
= from_tag
;
155 static char *get_parent_name(const struct rev_name
*name
, int parent_number
)
157 struct strbuf sb
= STRBUF_INIT
;
160 strip_suffix(name
->tip_name
, "^0", &len
);
161 if (name
->generation
> 0) {
162 strbuf_grow(&sb
, len
+
163 1 + decimal_width(name
->generation
) +
164 1 + decimal_width(parent_number
));
165 strbuf_addf(&sb
, "%.*s~%d^%d", (int)len
, name
->tip_name
,
166 name
->generation
, parent_number
);
168 strbuf_grow(&sb
, len
+
169 1 + decimal_width(parent_number
));
170 strbuf_addf(&sb
, "%.*s^%d", (int)len
, name
->tip_name
,
173 return strbuf_detach(&sb
, NULL
);
176 static void name_rev(struct commit
*start_commit
,
177 const char *tip_name
, timestamp_t taggerdate
,
178 int from_tag
, int deref
)
180 struct prio_queue queue
;
181 struct commit
*commit
;
182 struct commit
**parents_to_queue
= NULL
;
183 size_t parents_to_queue_nr
, parents_to_queue_alloc
= 0;
184 struct rev_name
*start_name
;
186 parse_commit(start_commit
);
187 if (commit_is_before_cutoff(start_commit
))
190 start_name
= create_or_update_name(start_commit
, taggerdate
, 0, 0,
195 start_name
->tip_name
= xstrfmt("%s^0", tip_name
);
197 start_name
->tip_name
= xstrdup(tip_name
);
199 memset(&queue
, 0, sizeof(queue
)); /* Use the prio_queue as LIFO */
200 prio_queue_put(&queue
, start_commit
);
202 while ((commit
= prio_queue_get(&queue
))) {
203 struct rev_name
*name
= get_commit_rev_name(commit
);
204 struct commit_list
*parents
;
205 int parent_number
= 1;
207 parents_to_queue_nr
= 0;
209 for (parents
= commit
->parents
;
211 parents
= parents
->next
, parent_number
++) {
212 struct commit
*parent
= parents
->item
;
213 struct rev_name
*parent_name
;
214 int generation
, distance
;
216 parse_commit(parent
);
217 if (commit_is_before_cutoff(parent
))
220 if (parent_number
> 1) {
222 distance
= name
->distance
+ MERGE_TRAVERSAL_WEIGHT
;
224 generation
= name
->generation
+ 1;
225 distance
= name
->distance
+ 1;
228 parent_name
= create_or_update_name(parent
, taggerdate
,
232 if (parent_number
> 1)
233 parent_name
->tip_name
=
234 get_parent_name(name
,
237 parent_name
->tip_name
= name
->tip_name
;
238 ALLOC_GROW(parents_to_queue
,
239 parents_to_queue_nr
+ 1,
240 parents_to_queue_alloc
);
241 parents_to_queue
[parents_to_queue_nr
] = parent
;
242 parents_to_queue_nr
++;
246 /* The first parent must come out first from the prio_queue */
247 while (parents_to_queue_nr
)
248 prio_queue_put(&queue
,
249 parents_to_queue
[--parents_to_queue_nr
]);
252 clear_prio_queue(&queue
);
253 free(parents_to_queue
);
256 static int subpath_matches(const char *path
, const char *filter
)
258 const char *subpath
= path
;
261 if (!wildmatch(filter
, subpath
, 0))
262 return subpath
- path
;
263 subpath
= strchr(subpath
, '/');
270 struct name_ref_data
{
273 struct string_list ref_filters
;
274 struct string_list exclude_filters
;
277 static struct tip_table
{
278 struct tip_table_entry
{
279 struct object_id oid
;
281 struct commit
*commit
;
282 timestamp_t taggerdate
;
283 unsigned int from_tag
:1;
284 unsigned int deref
:1;
291 static void add_to_tip_table(const struct object_id
*oid
, const char *refname
,
292 int shorten_unambiguous
, struct commit
*commit
,
293 timestamp_t taggerdate
, int from_tag
, int deref
)
295 char *short_refname
= NULL
;
297 if (shorten_unambiguous
)
298 short_refname
= shorten_unambiguous_ref(refname
, 0);
299 else if (skip_prefix(refname
, "refs/heads/", &refname
))
300 ; /* refname already advanced */
302 skip_prefix(refname
, "refs/", &refname
);
304 ALLOC_GROW(tip_table
.table
, tip_table
.nr
+ 1, tip_table
.alloc
);
305 oidcpy(&tip_table
.table
[tip_table
.nr
].oid
, oid
);
306 tip_table
.table
[tip_table
.nr
].refname
= short_refname
?
307 short_refname
: xstrdup(refname
);
308 tip_table
.table
[tip_table
.nr
].commit
= commit
;
309 tip_table
.table
[tip_table
.nr
].taggerdate
= taggerdate
;
310 tip_table
.table
[tip_table
.nr
].from_tag
= from_tag
;
311 tip_table
.table
[tip_table
.nr
].deref
= deref
;
313 tip_table
.sorted
= 0;
316 static int tipcmp(const void *a_
, const void *b_
)
318 const struct tip_table_entry
*a
= a_
, *b
= b_
;
319 return oidcmp(&a
->oid
, &b
->oid
);
322 static int cmp_by_tag_and_age(const void *a_
, const void *b_
)
324 const struct tip_table_entry
*a
= a_
, *b
= b_
;
328 cmp
= b
->from_tag
- a
->from_tag
;
332 /* Older is better. */
333 if (a
->taggerdate
< b
->taggerdate
)
335 return a
->taggerdate
!= b
->taggerdate
;
338 static int name_ref(const char *path
, const struct object_id
*oid
,
339 int flags UNUSED
, void *cb_data
)
341 struct object
*o
= parse_object(the_repository
, oid
);
342 struct name_ref_data
*data
= cb_data
;
343 int can_abbreviate_output
= data
->tags_only
&& data
->name_only
;
346 struct commit
*commit
= NULL
;
347 timestamp_t taggerdate
= TIME_MAX
;
349 if (data
->tags_only
&& !starts_with(path
, "refs/tags/"))
352 if (data
->exclude_filters
.nr
) {
353 struct string_list_item
*item
;
355 for_each_string_list_item(item
, &data
->exclude_filters
) {
356 if (subpath_matches(path
, item
->string
) >= 0)
361 if (data
->ref_filters
.nr
) {
362 struct string_list_item
*item
;
365 /* See if any of the patterns match. */
366 for_each_string_list_item(item
, &data
->ref_filters
) {
368 * Check all patterns even after finding a match, so
369 * that we can see if a match with a subpath exists.
370 * When a user asked for 'refs/tags/v*' and 'v1.*',
371 * both of which match, the user is showing her
372 * willingness to accept a shortened output by having
373 * the 'v1.*' in the acceptable refnames, so we
374 * shouldn't stop when seeing 'refs/tags/v1.4' matches
375 * 'refs/tags/v*'. We should show it as 'v1.4'.
377 switch (subpath_matches(path
, item
->string
)) {
378 case -1: /* did not match */
380 case 0: /* matched fully */
383 default: /* matched subpath */
385 can_abbreviate_output
= 1;
390 /* If none of the patterns matched, stop now */
395 while (o
&& o
->type
== OBJ_TAG
) {
396 struct tag
*t
= (struct tag
*) o
;
398 break; /* broken repository */
399 o
= parse_object(the_repository
, &t
->tagged
->oid
);
401 taggerdate
= t
->date
;
403 if (o
&& o
->type
== OBJ_COMMIT
) {
404 commit
= (struct commit
*)o
;
405 from_tag
= starts_with(path
, "refs/tags/");
406 if (taggerdate
== TIME_MAX
)
407 taggerdate
= commit
->date
;
410 add_to_tip_table(oid
, path
, can_abbreviate_output
, commit
, taggerdate
,
415 static void name_tips(void)
420 * Try to set better names first, so that worse ones spread
423 QSORT(tip_table
.table
, tip_table
.nr
, cmp_by_tag_and_age
);
424 for (i
= 0; i
< tip_table
.nr
; i
++) {
425 struct tip_table_entry
*e
= &tip_table
.table
[i
];
427 name_rev(e
->commit
, e
->refname
, e
->taggerdate
,
428 e
->from_tag
, e
->deref
);
433 static const struct object_id
*nth_tip_table_ent(size_t ix
, const void *table_
)
435 const struct tip_table_entry
*table
= table_
;
436 return &table
[ix
].oid
;
439 static const char *get_exact_ref_match(const struct object
*o
)
443 if (!tip_table
.table
|| !tip_table
.nr
)
446 if (!tip_table
.sorted
) {
447 QSORT(tip_table
.table
, tip_table
.nr
, tipcmp
);
448 tip_table
.sorted
= 1;
451 found
= oid_pos(&o
->oid
, tip_table
.table
, tip_table
.nr
,
454 return tip_table
.table
[found
].refname
;
458 /* may return a constant string or use "buf" as scratch space */
459 static const char *get_rev_name(const struct object
*o
, struct strbuf
*buf
)
462 const struct commit
*c
;
464 if (o
->type
!= OBJ_COMMIT
)
465 return get_exact_ref_match(o
);
466 c
= (const struct commit
*) o
;
467 n
= get_commit_rev_name(c
);
475 strbuf_addstr(buf
, n
->tip_name
);
476 strbuf_strip_suffix(buf
, "^0");
477 strbuf_addf(buf
, "~%d", n
->generation
);
482 static void show_name(const struct object
*obj
,
483 const char *caller_name
,
484 int always
, int allow_undefined
, int name_only
)
487 const struct object_id
*oid
= &obj
->oid
;
488 struct strbuf buf
= STRBUF_INIT
;
491 printf("%s ", caller_name
? caller_name
: oid_to_hex(oid
));
492 name
= get_rev_name(obj
, &buf
);
494 printf("%s\n", name
);
495 else if (allow_undefined
)
496 printf("undefined\n");
498 printf("%s\n", find_unique_abbrev(oid
, DEFAULT_ABBREV
));
500 die("cannot describe '%s'", oid_to_hex(oid
));
501 strbuf_release(&buf
);
504 static char const * const name_rev_usage
[] = {
505 N_("git name-rev [<options>] <commit>..."),
506 N_("git name-rev [<options>] --all"),
507 N_("git name-rev [<options>] --annotate-stdin"),
511 static void name_rev_line(char *p
, struct name_ref_data
*data
)
513 struct strbuf buf
= STRBUF_INIT
;
516 const unsigned hexsz
= the_hash_algo
->hexsz
;
518 for (p_start
= p
; *p
; p
++) {
519 #define ishex(x) (isdigit((x)) || ((x) >= 'a' && (x) <= 'f'))
522 else if (++counter
== hexsz
&&
524 struct object_id oid
;
525 const char *name
= NULL
;
527 int p_len
= p
- p_start
+ 1;
532 if (!get_oid(p
- (hexsz
- 1), &oid
)) {
534 lookup_object(the_repository
, &oid
);
536 name
= get_rev_name(o
, &buf
);
544 printf("%.*s%s", p_len
- hexsz
, p_start
, name
);
546 printf("%.*s (%s)", p_len
, p_start
, name
);
553 fwrite(p_start
, p
- p_start
, 1, stdout
);
555 strbuf_release(&buf
);
558 int cmd_name_rev(int argc
, const char **argv
, const char *prefix
)
560 struct object_array revs
= OBJECT_ARRAY_INIT
;
561 int all
= 0, annotate_stdin
= 0, transform_stdin
= 0, allow_undefined
= 1, always
= 0, peel_tag
= 0;
562 struct name_ref_data data
= { 0, 0, STRING_LIST_INIT_NODUP
, STRING_LIST_INIT_NODUP
};
563 struct option opts
[] = {
564 OPT_BOOL(0, "name-only", &data
.name_only
, N_("print only ref-based names (no object names)")),
565 OPT_BOOL(0, "tags", &data
.tags_only
, N_("only use tags to name the commits")),
566 OPT_STRING_LIST(0, "refs", &data
.ref_filters
, N_("pattern"),
567 N_("only use refs matching <pattern>")),
568 OPT_STRING_LIST(0, "exclude", &data
.exclude_filters
, N_("pattern"),
569 N_("ignore refs matching <pattern>")),
571 OPT_BOOL(0, "all", &all
, N_("list all commits reachable from all refs")),
572 OPT_BOOL(0, "stdin", &transform_stdin
, N_("deprecated: use --annotate-stdin instead")),
573 OPT_BOOL(0, "annotate-stdin", &annotate_stdin
, N_("annotate text from stdin")),
574 OPT_BOOL(0, "undefined", &allow_undefined
, N_("allow to print `undefined` names (default)")),
575 OPT_BOOL(0, "always", &always
,
576 N_("show abbreviated commit object as fallback")),
578 /* A Hidden OPT_BOOL */
579 OPTION_SET_INT
, 0, "peel-tag", &peel_tag
, NULL
,
580 N_("dereference tags in the input (internal use)"),
581 PARSE_OPT_NOARG
| PARSE_OPT_HIDDEN
, NULL
, 1,
586 init_commit_rev_name(&rev_names
);
587 git_config(git_default_config
, NULL
);
588 argc
= parse_options(argc
, argv
, prefix
, opts
, name_rev_usage
, 0);
590 if (transform_stdin
) {
591 warning("--stdin is deprecated. Please use --annotate-stdin instead, "
592 "which is functionally equivalent.\n"
593 "This option will be removed in a future release.");
597 if (all
+ annotate_stdin
+ !!argc
> 1) {
598 error("Specify either a list, or --all, not both!");
599 usage_with_options(name_rev_usage
, opts
);
601 if (all
|| annotate_stdin
)
604 for (; argc
; argc
--, argv
++) {
605 struct object_id oid
;
606 struct object
*object
;
607 struct commit
*commit
;
609 if (get_oid(*argv
, &oid
)) {
610 fprintf(stderr
, "Could not get sha1 for %s. Skipping.\n",
616 object
= parse_object(the_repository
, &oid
);
618 struct object
*peeled
= deref_tag(the_repository
,
620 if (peeled
&& peeled
->type
== OBJ_COMMIT
)
621 commit
= (struct commit
*)peeled
;
625 fprintf(stderr
, "Could not get object for %s. Skipping.\n",
631 set_commit_cutoff(commit
);
635 fprintf(stderr
, "Could not get commit for %s. Skipping.\n",
639 object
= (struct object
*)commit
;
641 add_object_array(object
, *argv
, &revs
);
644 adjust_cutoff_timestamp_for_slop();
646 for_each_ref(name_ref
, &data
);
649 if (annotate_stdin
) {
650 struct strbuf sb
= STRBUF_INIT
;
652 while (strbuf_getline(&sb
, stdin
) != EOF
) {
653 strbuf_addch(&sb
, '\n');
654 name_rev_line(sb
.buf
, &data
);
660 max
= get_max_object_index();
661 for (i
= 0; i
< max
; i
++) {
662 struct object
*obj
= get_indexed_object(i
);
663 if (!obj
|| obj
->type
!= OBJ_COMMIT
)
666 always
, allow_undefined
, data
.name_only
);
670 for (i
= 0; i
< revs
.nr
; i
++)
671 show_name(revs
.objects
[i
].item
, revs
.objects
[i
].name
,
672 always
, allow_undefined
, data
.name_only
);