[GSoC 2010] The 2nd week

[GSoC 2010] The 2nd week

[Bo Yang]

Hi,

   I have deal with many graduated works personally in my college, so
it is a busy week for me and this update comes a little later.  Of
course, I get progress on git development. Generally:
1. follow the issues of '--graph improvement' series;
2. try to find out a way to deal with the range split/combine problem.

And I think it is worth to mention how we will deal with the line
ranges when we follow the history, my mentor Thomas give the idea to
use a topo-order traverse, and I get a detail solution from that.

The line level browser will start at certain commit and its line
ranges, the ranges will not split/combine when we just encounter
linear history. But when it comes the merge commit, one branch will
take part of the ranges and other branches will take others. That
means the ranges will split here and will combine again after we reach
the common ancestor of all branches. Since, we will not know what a
commit's interesting ranges until all its children branches' commit's
ranges combine, so we need to walk the commits in topo-order and to
get the parents' commits' interesting ranges when we reach a commit.
This will make sure, when we reach some commit, its ranges is combined
and valid. Generally,
1. Sort all the commits in topo-order and put the sorted list in [list];
2. Pull one commit from [list], split the ranges according parents of
current commit, output the diff between current commit and each
parent;
3. Loop 2 until exhaust the [list];

Of course, the commit touch no interesting ranges will be ignored.

The point here is we will traverse the commit graph twice to achieve
this, I think it is the only way to do this and if there is some
smarter way to do this, please point me out, thanks!

-- 
Regards!
Bo
----------------------------
My blog: http://blog.morebits.org
Why Git: http://www.whygitisbetterthanx.com/