Re: [PATCH] git-pickaxe: blame rewritten.

From: Luben Tuikov <ltuikov@yahoo.com>
Date: Oct 12, 2006, 19:31 UTC
Message-ID: <20061012193107.44651.qmail@web31805.mail.mud.yahoo.com>
In-Reply-To: <7v7iz5rk4b.fsf@assigned-by-dhcp.cox.net>

--- Junio C Hamano <junkio@cox.net> wrote:

Show 5 quoted lines

> Currently it does what git-blame does, but only faster.
> 
> More importantly, its internal structure is designed to support
> content movement (aka cut-and-paste) more easily by allowing
> more than one paths to be taken from the same commit.

Good work.

> I have given only cursory check to its output (some files are
> blamed slightly differently from how git-blame does), but it

Details?  How differently?

> appears that there is no major breakage.  You can see for
> example try annotating builtin-apply.c starting from v1.4.0;
> there are two differences, which pickaxe assigns blame to older
> commits and both of them seem to be sensible.

Renames are naturally supported?

Show 12 quoted lines

> diff --git a/Documentation/git-pickaxe.txt b/Documentation/git-pickaxe.txt
> new file mode 100644
> index 0000000..7f30cdf
> --- /dev/null
> +++ b/Documentation/git-pickaxe.txt
> @@ -0,0 +1,104 @@
> +git-pickaxe(1)
> +==============
> +
> +NAME
> +----
> +git-pickaxe - Show what revision and author last modified each line of a file

[...]

> +THE PORCELAIN FORMAT
> +--------------------
> +

Let's quantify the output: ---cut--- The porcelain format is as follows:

<SHA-1> <orig line> <line> [<num lines> author <name> author-mail <email format> author-time <time> author-tz <TZ> committer <name> committer-mail <email format> committer-time <time> committer-tz <TZ> filename <string> summary <string>] <TAB><line data>

Where
  <SHA-1> is the SHA-1 of the commit which introduces this line.
  <orig line> it the line number where this line is introduced.
  <line> is the line number of the final file (at SHA-1 commit)

Then, if <SHA-1> is different from the previous line's SHA-1 (if no previous then always different), a header follows. It starts by the number of lines that this <SHA-1> commit introduces, then on a new line, information about about the commit is printed for the following seveal lines, then newline, TAB, and the line data.

If, OTOH, <SHA-1> is the same as the previous line's <SHA-1> then the header is not printed as indicated by brackets. Just newline, TAB, and the line data. ---cut----

This kind of makes it slightly clearer.

Junio, is it possible to also print the "previous" commit? I mean, is it tenable to print the commit such that a "git-diff C B -- A:file" will give a diff of the block of lines we're looking at?

Picture:

Annotate A:file C B line 1 X D line 2 C B line 3 F G line 4 ...

Currently we do not print "C, X, F", but only "B, D, G". So in effect, <orig line> is the line of, wlg, "C:file" where line 1 was introduced (by commit B). I.e. the "parent" commit of that commit, which doesn't always exist. (e.g. if the commit added the file)

Is this tenable? If it is not or if it is going to make it slow or ambiguous, lets forget about it.

     Luben