Hi! For a very long time I had wanted to get the output of diff to include blame information as well (to see when something was added/removed).
I just created a very small (and rough) tool for that purpose. It's written in python and if it gets to something better than a small tool, I think it could be worth to be added into git main (perhaps into contrib?). If you want to give ir a try: https://github.com/eantoranz/difflame Just provide the two treeishs you would like to diff (no more parameters are accepted at the time) and you will get the diff along with blame. Running it right now on the project itself: ✔ ~/difflame [master L|⚑ 1] 23:21 $ ./difflame.py HEAD~3 HEAD~ diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..a82aa27 --- /dev/null +++ b/README.txt @@ -0,0 +1,11 @@ +3d426842 (Edmundo Carmona Antoranz 2017-01-17 22:26:18 -0600 1) difflame +3d426842 (Edmundo Carmona Antoranz 2017-01-17 22:26:18 -0600 2) +3d426842 (Edmundo Carmona Antoranz 2017-01-17 22:26:18 -0600 3) Copyright 2017 Edmundo Carmona Antoranz +3d426842 (Edmundo Carmona Antoranz 2017-01-17 22:26:18 -0600 4) Released under the terms of GPLv2 +3d426842 (Edmundo Carmona Antoranz 2017-01-17 22:26:18 -0600 5) +3d426842 (Edmundo Carmona Antoranz 2017-01-17 22:26:18 -0600 6) Show the output of diff with the additional information of blame. +3d426842 (Edmundo Carmona Antoranz 2017-01-17 22:26:18 -0600 7) +3d426842 (Edmundo Carmona Antoranz 2017-01-17 22:26:18 -0600 8) Lines that remain the same or that were added will indicate when those lines were 'added' to the file +3d426842 (Edmundo Carmona Antoranz 2017-01-17 22:26:18 -0600 9) Lines that were removed will display the last revision where those lines were _present_ on the file (as provided by blame --re verse) +3d426842 (Edmundo Carmona Antoranz 2017-01-17 22:26:18 -0600 10) +3d426842 (Edmundo Carmona Antoranz 2017-01-17 22:26:18 -0600 11) At the moment, only two parameters need to be provided: two treeishs to get the diff from diff --git a/difflame.py b/difflame.py index f6e879b..06bfc03 100755 --- a/difflame.py +++ b/difflame.py @@ -112,16 +112,20 @@ def process_file_from_diff_output(output_lines, starting_line): c661286f (Edmundo Carmona Antoranz 2017-01-17 20:10:07 -0600 112) diff_line = output_lines[i].split() c661286f (Edmundo Carmona Antoranz 2017-01-17 20:10:07 -0600 113) if diff_line[0] != "diff": c661286f (Edmundo Carmona Antoranz 2017-01-17 20:10:07 -0600 114) raise Exception("Doesn't seem to exist a 'diff' line at line " + str(i + 1) + ": " + output_lines[i]) -3d426842 (Edmundo Carmona Antoranz 2017-01-17 22:26:18 -0600 115) original_name = diff_line[1] -3d426842 (Edmundo Carmona Antoranz 2017-01-17 22:26:18 -0600 116) final_name = diff_line[2] +f135bf04 (Edmundo Carmona Antoranz 2017-01-17 22:50:50 -0600 115) original_name = diff_line[2] +f135bf04 (Edmundo Carmona Antoranz 2017-01-17 22:50:50 -0600 116) final_name = diff_line[3] c661286f (Edmundo Carmona Antoranz 2017-01-17 20:10:07 -0600 117) print output_lines[i]; i+=1 . . . Hope you find it useful Best regards!
