From b1cda8cad6b71e3b8c294f2bd9c9a10f9c88299a Mon Sep 17 00:00:00 2001
From: Thomas Koutcher <thomas.koutcher@online.fr>
Date: Thu, 7 Mar 2024 20:05:45 +0100
Subject: [PATCH] Update message in the blame view

* Show the commit the line came from in the title window.

* Show the commit where annotating starts in the status window.
---
 src/blame.c                   | 13 ++++++++++---
 test/blame/default-test       |  8 ++++----
 test/blame/initial-diff-test  |  2 +-
 test/blame/revargs-test       |  4 ++--
 test/blame/start-on-line-test |  2 +-
 test/blame/stash-test         |  6 ++++--
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/blame.c b/src/blame.c
index 785b88d91..b8c094ff7 100644
--- a/src/blame.c
+++ b/src/blame.c
@@ -234,6 +234,10 @@ blame_read(struct view *view, struct buffer *buf, bool force_stop)
 			update_view_title(view);
 			redraw_view_from(view, 0);
 		}
+
+		if (view->env->ref[0])
+			update_status("Start annotating from %s", view->env->ref);
+
 		return true;
 	}
 
@@ -355,7 +359,7 @@ blame_go_forward(struct view *view, struct blame *blame, bool parent)
 	const char *filename = parent ? commit->parent_filename : commit->filename;
 
 	if (!*id && parent) {
-		report("The selected commit has no parents");
+		report("The selected commit has no parents with this file");
 		return;
 	}
 
@@ -474,10 +478,13 @@ blame_select(struct view *view, struct line *line)
 	if (!commit)
 		return;
 
-	if (string_rev_is_null(commit->id))
+	if (string_rev_is_null(commit->id)) {
 		string_ncopy(view->env->commit, "HEAD", 4);
-	else
+		string_format(view->ref, "%s", commit->filename);
+	} else {
 		string_copy_rev(view->env->commit, commit->id);
+		string_format(view->ref, "%s changed %s", commit->id, commit->filename);
+	}
 
 	if (strcmp(commit->filename, view->env->file))
 		string_format(view->env->file_old, "%s", commit->filename);
diff --git a/test/blame/default-test b/test/blame/default-test
index a7249e55d..1c113449c 100755
--- a/test/blame/default-test
+++ b/test/blame/default-test
@@ -56,7 +56,7 @@ assert_equals 'blame-default.screen' <<EOF
 90286e0 Jonas Fonseca      2013-10-14 13:15 -0400  26|
 90286e0 Jonas Fonseca      2013-10-14 13:15 -0400  27|   lazy val parent: Projec
 90286e0 Jonas Fonseca      2013-10-14 13:15 -0400  28|       id = "parent",
-[blame] project/Build.scala - line 1 of 64                                   43%
+[blame] 90286e0752016a6bca30dfa7ca236d1f99345eb8 changed project/Build.scala 43%
 EOF
 
 assert_equals 'blame-with-diff.screen' <<EOF
@@ -69,7 +69,7 @@ assert_equals 'blame-with-diff.screen' <<EOF
 90286e0 Jonas Fonseca      2013-10-14 13:15 -0400   7|
 4779f9b Jonas Fonseca      2013-11-26 20:13 -0500   8| object ScalaJSBenchmarks
 90286e0 Jonas Fonseca      2013-10-14 13:15 -0400   9|
-[blame] project/Build.scala - line 4 of 64                                   14%
+[blame] 74537d9b257954056d3caa19eb3837500aded883 changed project/Build.scala 14%
 commit 74537d9b257954056d3caa19eb3837500aded883
 Author:     Sébastien Doeraene <sjrdoeraene@gmail.com>
 AuthorDate: Tue Oct 29 18:46:52 2013 +0100
@@ -101,7 +101,7 @@ assert_equals 'blame-with-diff-no-file-filter.screen' <<EOF
 90286e0 Jonas Fonseca      2013-10-14 13:15 -0400   7|
 4779f9b Jonas Fonseca      2013-11-26 20:13 -0500   8| object ScalaJSBenchmarks
 90286e0 Jonas Fonseca      2013-10-14 13:15 -0400   9|
-[blame] project/Build.scala - line 4 of 64                                   14%
+[blame] 74537d9b257954056d3caa19eb3837500aded883 changed project/Build.scala 14%
 commit 74537d9b257954056d3caa19eb3837500aded883
 Author:     Sébastien Doeraene <sjrdoeraene@gmail.com>
 AuthorDate: Tue Oct 29 18:46:52 2013 +0100
@@ -152,5 +152,5 @@ assert_equals 'blame-parent-of-74537d9.screen' <<EOF
 90286e0 Jonas Fonseca 2013-10-14 13:15 -0400  26|
 90286e0 Jonas Fonseca 2013-10-14 13:15 -0400  27|   lazy val benchmarkSettings =
 90286e0 Jonas Fonseca 2013-10-14 13:15 -0400  28|       unmanagedSources in (Com
-[blame] project/Build.scala - line 4 of 66                                   42%
+[blame] 90286e0752016a6bca30dfa7ca236d1f99345eb8 changed project/Build.scala 42%
 EOF
diff --git a/test/blame/initial-diff-test b/test/blame/initial-diff-test
index b1242fb26..e62df23b7 100755
--- a/test/blame/initial-diff-test
+++ b/test/blame/initial-diff-test
@@ -63,5 +63,5 @@ assert_equals 'blame-deleted-line.screen' <<EOF
 0500  19x
 0500  20x   def add(benchmark: Benchmark) {
 0500  21x     benchmarks.push {
-[blame] common/Benchmark.scala - line 17 of 99                               21%
+[blame] 34d6868cfae60a7cc2494d282eaee27efa900059 changed common/Benchmark.sc 21%
 EOF
diff --git a/test/blame/revargs-test b/test/blame/revargs-test
index 1decc6bf4..aeede1078 100755
--- a/test/blame/revargs-test
+++ b/test/blame/revargs-test
@@ -49,7 +49,7 @@ assert_equals 'limit.screen' <<EOF
 74537d9 Sébastien Doeraene 2013-10-29 18:46 +0100  26|
 74537d9 Sébastien Doeraene 2013-10-29 18:46 +0100  27|   lazy val parent: Projec
 74537d9 Sébastien Doeraene 2013-10-29 18:46 +0100  28|       id = "parent",
-[blame] project/Build.scala - line 1 of 64                                   43%
+[blame] 74537d9b257954056d3caa19eb3837500aded883 changed project/Build.scala 43%
 EOF
 
 # confirm that we kept our lower bound
@@ -82,5 +82,5 @@ assert_equals 'parent-of-4779f9b.screen' <<EOF
 74537d9 Sébastien Doeraene 2013-10-29 18:46 +0100  26|
 74537d9 Sébastien Doeraene 2013-10-29 18:46 +0100  27|   lazy val benchmarkSetti
 74537d9 Sébastien Doeraene 2013-10-29 18:46 +0100  28|       unmanagedSources in
-[blame] project/Build.scala - line 8 of 69                                   40%
+[blame] 74537d9b257954056d3caa19eb3837500aded883 changed project/Build.scala 40%
 EOF
diff --git a/test/blame/start-on-line-test b/test/blame/start-on-line-test
index 4700e6892..17cfc39aa 100755
--- a/test/blame/start-on-line-test
+++ b/test/blame/start-on-line-test
@@ -46,5 +46,5 @@ ee91287 deltablue/src/main/scala/org/scalajs/benchmark/deltablue/DeltaBlue.scala
 b103989 deltablue/DeltaBlue.scala                                                Jonas Fonseca 2013-10-18 18:00 -0400  53|
 b103989 deltablue/DeltaBlue.scala                                                Jonas Fonseca 2013-10-18 18:00 -0400  54|   override def prefix = "DeltaBlue"
 b103989 deltablue/DeltaBlue.scala                                                Jonas Fonseca 2013-10-18 18:00 -0400  55|
-[blame] deltablue/src/main/scala/org/scalajs/benchmark/deltablue/DeltaBlue.scala - line 42 of 711                                                                                                     7%
+[blame] b103989d59edab3adc312ff5408fa3d344ea0201 changed deltablue/DeltaBlue.scala - line 42 of 711                                                                                                   7%
 EOF
diff --git a/test/blame/stash-test b/test/blame/stash-test
index 4e9b059c8..7d17d269d 100755
--- a/test/blame/stash-test
+++ b/test/blame/stash-test
@@ -26,6 +26,8 @@ test_setup_work_dir()
 {
 	echo "original line" > file
 	git add file
+	export GIT_AUTHOR_DATE="1486403695"
+	export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
 	git commit -m "Initial commit"
 	echo "changed line" > file
 	git stash
@@ -40,10 +42,10 @@ EOF
 
 assert_equals 'blame1.screen' <<EOF
 original line
-[blame] file - line 1 of 1 100%
+[blame] 973a46fa50e2704ee2d550a931ad8edb1c50731c changed file - line 1 of 1 100%
 EOF
 
 assert_equals 'blame2.screen' <<EOF
 original line
-[blame] file - line 1 of 1 100%
+[blame] 973a46fa50e2704ee2d550a931ad8edb1c50731c changed file - line 1 of 1 100%
 EOF