[PATCH] git blame --progress
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:51
[PATCH] git blame --progress With --progress option, the command shows a fairly useless but amusing eye-candy while making the user wait. Signed-off-by: Junio C Hamano <redacted> --- René Scharfe [off-list ref] writes: > Junio C Hamano schrieb: >> Although I'd apply it anyway, strictly speaking, I think this >> patch should not matter because any real Porcelain would be >> using this as an upstream of a pipe to its drawing engine. >> >> Well, unless that Porcelain drives --incremental through a pair >> of ptys, but I do not think it is likely ;-). > > Ha!, didn't think of that. I still like it more without a pager > even if run on a terminal, because then you can *see* that it's > really incremental (without needing to unset PAGER). I'm a > non-believer. ;-) builtin-blame.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 84 insertions(+), 3 deletions(-)
diff --git a/builtin-blame.c b/builtin-blame.c
index 02bda5e..cd54acf 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c@@ -17,7 +17,7 @@ #include "xdiff-interface.h" static char blame_usage[] = -"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [commit] [--] file\n" +"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [--progress] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [commit] [--] file\n" " -c, --compatibility Use the same output mode as git-annotate (Default: off)\n" " -b Show blank SHA-1 for boundary commits (Default: off)\n" " -l, --long Show long commit SHA1 (Default: off)\n"
@@ -29,6 +29,7 @@ static char blame_usage[] = " -L n,m Process only line range n,m, counting from 1\n" " -M, -C Find line movements within and across files\n" " --incremental Show blame entries as we find them, incrementally\n" +" --progress Show fairly useless progress display\n" " -S revs-file Use revisions from revs-file instead of calling git-rev-list\n"; static int longest_file;
@@ -39,6 +40,7 @@ static int max_score_digits; static int show_root; static int blank_boundary; static int incremental; +static int eye_candy; #ifndef DEBUG #define DEBUG 0
@@ -1189,7 +1191,80 @@ static void write_filename_info(const char *path) putchar('\n'); } -static void found_guilty_entry(struct blame_entry *ent) +#define NUM_EC_SPOT 500 +#define NUM_EC_SPOT_PER_GROUP 10 +#define NUM_EC_SPOT_PER_ROW 50 + +static int eye_candy_spots(struct scoreboard *sb) +{ + int num_lines = sb->num_lines; + if (NUM_EC_SPOT < num_lines) + return NUM_EC_SPOT; + return num_lines; +} + +static void initialize_eye_candy(struct scoreboard *sb) +{ + int cnt = eye_candy_spots(sb); + int i, j; + + fprintf(stderr, "\033[2JAssigning blame for %s\n", sb->path); + for (i = j = 0; i < cnt; i++) { + fputc('.', stderr); + j++; + if (NUM_EC_SPOT_PER_ROW <= j) { + j = 0; + fputc('\n', stderr); + } + else if ((j % NUM_EC_SPOT_PER_GROUP) == 0) + fputc(' ', stderr); + } + if (j) + fputc('\n', stderr); +} + +static int eye_candy_spot(struct scoreboard *sb, int lno) +{ + int cnt = eye_candy_spots(sb); + return lno * cnt / sb->num_lines; +} + +static void update_eye_candy(struct scoreboard *sb, struct blame_entry *ent) +{ + int cnt = eye_candy_spots(sb); + int spot_lo, spot_hi, spot; + struct blame_entry *lo, *hi; + + for (lo = ent; lo->prev && lo->prev->guilty; lo = lo->prev) + ; + spot_lo = eye_candy_spot(sb, lo->lno); + for (hi = ent; hi->next && hi->next->guilty; hi = hi->next) + ; + spot_hi = eye_candy_spot(sb, hi->lno + hi->num_lines - 1); + + for (spot = spot_lo; spot <= spot_hi; spot++) { + int spot_x, spot_y; + + spot_x = spot % NUM_EC_SPOT_PER_ROW; + spot_x = spot_x + spot_x / NUM_EC_SPOT_PER_GROUP; + + spot_y = spot / NUM_EC_SPOT_PER_ROW; + spot_y = (cnt / NUM_EC_SPOT_PER_ROW) - spot_y; + if (cnt < NUM_EC_SPOT && (cnt % NUM_EC_SPOT_PER_ROW)) + spot_y++; + + if (spot_y) + fprintf(stderr, "\033[%dA", spot_y); + if (spot_x) + fprintf(stderr, "\033[%dC", spot_x); + fputc('*', stderr); + fprintf(stderr, "\033[%dD", spot_x + 1); + if (spot_y) + fprintf(stderr, "\033[%dB", spot_y); + } +} + +static void found_guilty_entry(struct scoreboard *sb, struct blame_entry *ent) { if (ent->guilty) return;
@@ -1218,6 +1293,8 @@ static void found_guilty_entry(struct blame_entry *ent) } write_filename_info(suspect->path); } + else if (eye_candy) + update_eye_candy(sb, ent); } static void assign_blame(struct scoreboard *sb, struct rev_info *revs, int opt)
@@ -1253,7 +1330,7 @@ static void assign_blame(struct scoreboard *sb, struct rev_info *revs, int opt) /* Take responsibility for the remaining entries */ for (ent = sb->ent; ent; ent = ent->next) if (!cmp_suspect(ent->suspect, suspect)) - found_guilty_entry(ent); + found_guilty_entry(sb, ent); origin_decref(suspect); if (DEBUG) /* sanity */
@@ -1768,6 +1845,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix) else if (!strcmp("-n", arg) || !strcmp("--show-number", arg)) output_option |= OUTPUT_SHOW_NUMBER; + else if (!strcmp("--progress", arg)) + eye_candy = 1; else if (!strcmp("-p", arg) || !strcmp("--porcelain", arg)) output_option |= OUTPUT_PORCELAIN;
@@ -1951,6 +2030,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix) die("reading graft file %s failed: %s", revs_file, strerror(errno)); + if (eye_candy) + initialize_eye_candy(&sb); assign_blame(&sb, &revs, opt); if (incremental)