mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jx/blame-align-relative-time' into maint

Browse Source 
"git blame" miscounted number of columns needed to show localized
timestamps, resulting in jaggy left-side-edge of the source code
lines in its output.

* jx/blame-align-relative-time:
  blame: dynamic blame_date_width for different locales
  blame: fix broken time_buf paddings in relative timestamp
This commit is contained in:
Junio C Hamano
2014-06-25 11:46:34 -07:00
parent c122c9a968 dd75553b35
commit 6bf84263b3
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
builtin/blame.c
View File

@ -1556,22 +1556,29 @@ static void assign_blame(struct scoreboard *sb, int opt)
static const char *format_time(unsigned long time, const char *tz_str, static const char *format_time(unsigned long time, const char *tz_str,
int show_raw_time) int show_raw_time)
{ {
static char time_buf[128]; static struct strbuf time_buf = STRBUF_INIT;
strbuf_reset(&time_buf);
if (show_raw_time) { if (show_raw_time) {
snprintf(time_buf, sizeof(time_buf), "%lu %s", time, tz_str); strbuf_addf(&time_buf, "%lu %s", time, tz_str);
} }
else { else {
const char *time_str; const char *time_str;
int time_len; size_t time_width;
int tz; int tz;
tz = atoi(tz_str); tz = atoi(tz_str);
time_str = show_date(time, tz, blame_date_mode); time_str = show_date(time, tz, blame_date_mode);
time_len = strlen(time_str); strbuf_addstr(&time_buf, time_str);
memcpy(time_buf, time_str, time_len); /*
memset(time_buf + time_len, ' ', blame_date_width - time_len); * Add space paddings to time_buf to display a fixed width
* string, and use time_width for display width calibration.
*/
for (time_width = utf8_strwidth(time_str);
time_width < blame_date_width;
time_width++)
strbuf_addch(&time_buf, ' ');
} }
return time_buf; return time_buf.buf;
} }
#define OUTPUT_ANNOTATE_COMPAT 001 #define OUTPUT_ANNOTATE_COMPAT 001
@ -2331,7 +2338,14 @@ parse_done:
blame_date_width = sizeof("2006-10-19"); blame_date_width = sizeof("2006-10-19");
break; break;
case DATE_RELATIVE: case DATE_RELATIVE:
/* "normal" is used as the fallback for "relative" */ /* TRANSLATORS: This string is used to tell us the maximum
display width for a relative timestamp in "git blame"
output. For C locale, "4 years, 11 months ago", which
takes 22 places, is the longest among various forms of
relative timestamps, but your language may need more or
fewer display columns. */
blame_date_width = utf8_strwidth(_("4 years, 11 months ago")) + 1; /* add the null */
break;
case DATE_LOCAL: case DATE_LOCAL:
case DATE_NORMAL: case DATE_NORMAL:
blame_date_width = sizeof("Thu Oct 19 16:00:04 2006 -0700"); blame_date_width = sizeof("Thu Oct 19 16:00:04 2006 -0700");