Re: [egit-dev] [RFC] Showing diff in History View

[Robin Rosenberg <robin.rosenberg@xxxxxxxxxx>]

fredag 23 oktober 2009 12:57:55 skrev  Lay, Stefan:
> We want to show the diff result from the new diff implementation (still
> located in branch cq-diff) in the history view. The result should look like
> in gitk, or like the result of git show. At first we tackle only the case
> of one parent commit (no merges).
>
> Firstly, I have a question about the branching infrastructure:
> Our code in egit is based on commits located in the cq-diff branch of jgit.
> How should I push to Gerrit? Will there be a new branch in the egit
> repository?

JGit has its own repo.  See http://wiki.eclipse.org/EGit/Contributor_Guide
for details.  Examples for JGit and EGit included.

> Secondly, I have a conceptual question:
> In eclipse history view we filter for the commits which contain the
> selected resources, or the enclosing folder or project; as I know, this
> feature does not exist in gitk. 
gitk does filter on paths, i.e. corresponds to what we do in eclipse, though
you have to edit the paths manually to filter on directories instead of files.

> Should we also filter the diff output
> accordingly? The filter makes the diff output somehow difficult to
> understand. The parent changes to one that is not the "real" parent. The
> diffs are only a subset of all diffs between the two commits.

Yes, you should filter the diff if filtering is enabled. I'm sure this will be 
the topic of long debates, especially when there is an implementation to
look at. You might want to show show screenshots even before you have
code ready for review.

-- robin