Re: GSoC draft proposal: Line-level history browser

From: Jakub Narebski <jnareb@gmail.com>
Date: Mar 22, 2010, 15:48 UTC
Message-ID: <m3hbo8jr2e.fsf@localhost.localdomain>
In-Reply-To: <41f08ee11003212052p6b0a7495j2e38f24839541ffb@mail.gmail.com>

Bo Yang <struggleyb.nku@gmail.com> writes:

Show 5 quoted lines

> This project will add a new feature for 'git log' to display line
> level history. It can trace the history of any line range of certain
> file at any revision. For simplity, users can run the command like: '
> git log -L builtin/diff.c:6,8 ', he will get the change history of
> code between line 6 and line 8 of the diff.c file.

I think that, at least at first, line-level log should follow the git-blame, i.e.

  git log -L <begin>,<end>  <revs>  -- <file>

If we want (in the future) to follow history of some lines from one file, and other lines from other file together, we do not need to use

  -L <file>:<begin>,<end>

syntax.  If parseopt allows, we can use posotion of parameters, i.e.

  <file1> -L <m>,<n>   <file2> -L <k>,<j>

> And for each history entry, it will provide the commits, the diff
> block which contains changes of users' interested lines.

The most important *new* algorithm you need to implement is, after finding (blame-like) the commit that created given version of given line, what was previous version of given line and which line that was.

You can probably find some heuristic in existing merge tools, like emerge from GNU Emacs, or graphical diff tools.

-- 
Jakub Narebski
Poland
ShadeHawk on #git