xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rc tools git: blame buffer contents, not on-disk file

Browse Source 
When a buffer has unsaved deleted/added lines, then any blame
annotations below those lines may be off. Fix this by feeding the
latest buffer contents to Git.  Unfortunately there is no easy way
to distinguish between "Unsaved" and "Saved but not committed yet"
so let's keep using the umbrella term.
This commit is contained in:
Johannes Altmanninger 2024-02-03 00:26:51 +01:00 committed by Maxime Coste
parent c2c978907f
commit da1adc9b94
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rc/tools/git.kak
View File

@ -166,12 +166,21 @@ define-command -params 1.. \
echo -to-file ${kak_response_fifo} 'hide_blame; exit' echo -to-file ${kak_response_fifo} 'hide_blame; exit'
}" }"
eval $(cat ${kak_response_fifo}) eval $(cat ${kak_response_fifo})
contents_fifo=$(mktemp -d "${TMPDIR:-/tmp}"/kak-git.XXXXXXXX)/fifo
mkfifo ${contents_fifo}
echo >${kak_command_fifo} 'evaluate-commands -save-regs | %{
set-register | %{
contents=$(cat; printf .)
( printf %s "${contents%.}" >'${contents_fifo}' ) >/dev/null 2>&1 &
}
execute-keys -client '${kak_client}' -draft %{%<a-|><ret>}
}'
( (
cd_bufdir cd_bufdir
printf %s "evaluate-commands -client '$kak_client' %{ printf %s "evaluate-commands -client '$kak_client' %{
set-option buffer=$kak_bufname git_blame_flags '$kak_timestamp' set-option buffer=$kak_bufname git_blame_flags '$kak_timestamp'
}" | kak -p ${kak_session} }" | kak -p ${kak_session}
git blame "$@" --incremental ${kak_buffile} | perl -wne ' git blame "$@" --incremental "${kak_buffile}" --contents - <$contents_fifo | perl -wne '
use POSIX qw(strftime); use POSIX qw(strftime);
sub send_flags { sub send_flags {
my $flush = shift; my $flush = shift;
@ -192,15 +201,20 @@ define-command -params 1.. \
$flags = ""; $flags = "";
$last_sent = $now; $last_sent = $now;
} }
chomp;
if (m/^([0-9a-f]+) ([0-9]+) ([0-9]+) ([0-9]+)/) { if (m/^([0-9a-f]+) ([0-9]+) ([0-9]+) ([0-9]+)/) {
send_flags(0); send_flags(0);
$sha = $1; $sha = $1;
$line = $3; $line = $3;
$count = $4; $count = $4;
} }
if (m/^author /) { $authors{$sha} = substr($_,7) } if (m/^author /) {
$authors{$sha} = substr($_,7);
$authors{$sha} = "Not Committed Yet" if $authors{$sha} eq "External file (--contents)";
}
if (m/^author-time ([0-9]*)/) { $dates{$sha} = strftime("%F %T", localtime $1) } if (m/^author-time ([0-9]*)/) { $dates{$sha} = strftime("%F %T", localtime $1) }
END { send_flags(1); }' END { send_flags(1); }'
rm -r $(dirname $contents_fifo)
) > /dev/null 2>&1 < /dev/null & ) > /dev/null 2>&1 < /dev/null &
} }