Commit b39d25c725b42c3da4f3bbab5cf8e263b3a5f719
2018-07-10T17:26:28
show day of commit in tog log view
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
diff --git a/tog/tog.c b/tog/tog.c
index edd2b6d..d905835 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -203,6 +203,7 @@ static const struct got_error *
draw_commit(struct got_commit_object *commit, struct got_object_id *id)
{
const struct got_error *err = NULL;
+ char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
char *logmsg0 = NULL, *logmsg = NULL;
char *author0 = NULL, *author = NULL;
wchar_t *wlogmsg = NULL, *wauthor = NULL;
@@ -212,23 +213,37 @@ draw_commit(struct got_commit_object *commit, struct got_object_id *id)
char *id_str = NULL;
size_t id_len;
int col, limit;
+ static const size_t date_display_cols = 9;
static const size_t id_display_cols = 8;
static const size_t author_display_cols = 16;
const int avail = COLS;
+ if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &commit->tm_committer)
+ >= sizeof(datebuf))
+ return got_error(GOT_ERR_NO_SPACE);
+
+ if (avail < date_display_cols)
+ limit = MIN(sizeof(datebuf) - 1, avail);
+ else
+ limit = MIN(date_display_cols, sizeof(datebuf) - 1);
+ waddnstr(tog_log_view.window, datebuf, limit);
+ col = limit + 1;
+ if (col > avail)
+ goto done;
+
err = got_object_id_str(&id_str, id);
if (err)
return err;
id_len = strlen(id_str);
- if (avail < id_display_cols) {
- limit = MIN(id_len, avail);
+ if (avail < date_display_cols + id_display_cols) {
+ limit = MIN(id_len, avail - date_display_cols);
waddnstr(tog_log_view.window, id_str, limit);
} else {
limit = MIN(id_display_cols, id_len);
waddnstr(tog_log_view.window, id_str, limit);
}
- col = limit + 1;
- while (col <= avail && col < id_display_cols + 2) {
+ col += limit;
+ while (col <= avail && col < date_display_cols + id_display_cols + 2) {
waddch(tog_log_view.window, ' ');
col++;
}
@@ -249,7 +264,7 @@ draw_commit(struct got_commit_object *commit, struct got_object_id *id)
if (at)
*at = '\0';
}
- limit = MIN(avail, author_display_cols);
+ limit = avail - col;
err = format_line(&wauthor, &author_width, author, limit);
if (err)
goto done;