Commit b4996beee4ab59f339d2b4de7cfc401ba2f22c4e
2022-06-16T07:04:07
show last-modified date in the "tog ref" view if the 'm' key is pressed Patch by Mark Jamsek
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108
diff --git a/tog/tog.1 b/tog/tog.1
index 1f0a260..d5a5e0f 100644
--- a/tog/tog.1
+++ b/tog/tog.1
@@ -496,6 +496,8 @@ view showing the tree resolved via the currently selected reference.
Show object IDs for all non-symbolic references displayed in the
.Cm ref
view.
+.It Cm m
+Show last modified date of each displayed reference.
.It Cm o
Toggle display order of references between sort by name and sort by timestamp.
.It Cm /
diff --git a/tog/tog.c b/tog/tog.c
index 0cd4949..a3599eb 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -470,7 +470,7 @@ struct tog_ref_view_state {
struct tog_reflist_entry *first_displayed_entry;
struct tog_reflist_entry *last_displayed_entry;
struct tog_reflist_entry *selected_entry;
- int nrefs, ndisplayed, selected, show_ids, sort_by_date;
+ int nrefs, ndisplayed, selected, show_date, show_ids, sort_by_date;
struct got_repository *repo;
struct tog_reflist_entry *matched_entry;
struct tog_colors colors;
@@ -6438,10 +6438,45 @@ show_ref_view(struct tog_view *view)
n = 0;
while (re && limit > 0) {
char *line = NULL;
+ char ymd[13]; /* YYYY-MM-DD + " " + NUL */
+ if (s->show_date) {
+ struct got_commit_object *ci;
+ struct got_tag_object *tag;
+ struct got_object_id *id;
+ struct tm tm;
+ time_t t;
+
+ err = got_ref_resolve(&id, s->repo, re->ref);
+ if (err)
+ return err;
+ err = got_object_open_as_tag(&tag, s->repo, id);
+ if (err) {
+ if (err->code != GOT_ERR_OBJ_TYPE) {
+ free(id);
+ return err;
+ }
+ err = got_object_open_as_commit(&ci, s->repo,
+ id);
+ if (err) {
+ free(id);
+ return err;
+ }
+ t = got_object_commit_get_committer_time(ci);
+ got_object_commit_close(ci);
+ } else {
+ t = got_object_tag_get_tagger_time(tag);
+ got_object_tag_close(tag);
+ }
+ free(id);
+ if (gmtime_r(&t, &tm) == NULL)
+ return got_error_from_errno("gmtime_r");
+ if (strftime(ymd, sizeof(ymd), "%G-%m-%d ", &tm) == 0)
+ return got_error(GOT_ERR_NO_SPACE);
+ }
if (got_ref_is_symbolic(re->ref)) {
- if (asprintf(&line, "%s -> %s",
- got_ref_get_name(re->ref),
+ if (asprintf(&line, "%s%s -> %s", s->show_date ?
+ ymd : "", got_ref_get_name(re->ref),
got_ref_get_symref_target(re->ref)) == -1)
return got_error_from_errno("asprintf");
} else if (s->show_ids) {
@@ -6455,7 +6490,7 @@ show_ref_view(struct tog_view *view)
free(id);
return err;
}
- if (asprintf(&line, "%s: %s",
+ if (asprintf(&line, "%s%s: %s", s->show_date ? ymd : "",
got_ref_get_name(re->ref), id_str) == -1) {
err = got_error_from_errno("asprintf");
free(id);
@@ -6464,11 +6499,9 @@ show_ref_view(struct tog_view *view)
}
free(id);
free(id_str);
- } else {
- line = strdup(got_ref_get_name(re->ref));
- if (line == NULL)
- return got_error_from_errno("strdup");
- }
+ } else if (asprintf(&line, "%s%s", s->show_date ? ymd : "",
+ got_ref_get_name(re->ref)) == -1)
+ return got_error_from_errno("asprintf");
err = format_line(&wline, &width, line, view->ncols, 0, 0);
if (err) {
@@ -6555,6 +6588,9 @@ input_ref_view(struct tog_view **new_view, struct tog_view *view, int ch)
case 'i':
s->show_ids = !s->show_ids;
break;
+ case 'm':
+ s->show_date = !s->show_date;
+ break;
case 'o':
s->sort_by_date = !s->sort_by_date;
err = got_reflist_sort(&tog_refs, s->sort_by_date ?