DESCRIPTION

[wip] Introduce internal API to integrate Team merging

Team provides a number of APIs to provide access to merge,
comparison and synchronization features. This introduces a
git-specific Subscriber implementation that can retrieve
information from three different sources, along with
implementations to use the index or a TreeWalk to populate
these three 'sources'.

Signed-off-by: Gustavo Green xxx@xxx.xxx
Change-Id: Ieda23bb556d342f421f03b93c7faa160998598aa


COMMENTS

author: Gustavo Green
date: 2015-02-27 14:12:38.000000000

Patch Set 2: Commit message was updated

-------------------------------------
author: Brenden Conley
date: 2015-02-27 14:12:45.000000000

Patch Set 2:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/6744/

-------------------------------------
author: Brenden Conley
date: 2015-02-27 14:32:33.000000000

Patch Set 2: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit.gerrit/6744/ : UNSTABLE

-------------------------------------
author: Brenden Conley
date: 2015-02-27 14:40:00.000000000

Patch Set 2: -Code-Review

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/6745/

-------------------------------------
author: Brenden Conley
date: 2015-02-27 14:55:16.000000000

Patch Set 2: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/6745/ : SUCCESS

-------------------------------------
author: Mackenzie Page
date: 2015-03-02 11:31:09.000000000

Patch Set 2:

(7 comments)

Looking very good overall, some minor changes requested.

Line:52, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitSyncInfoToDiffConverter.java -> No Test coverage

Line:68, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitSyncInfoToDiffConverter.java -> Nesting is too deep IMHO.

Line:86, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitSyncInfoToDiffConverter.java -> extract this block to method, there is another occurence

Line:195, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitSyncInfoToDiffConverter.java -> extract to package private class

Line:35, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java -> Terminology changes from base, local, remote to base, ours, theirs

Line:18, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/AbstractGitResourceVariant.java -> Low test coverage but might be acceptable.

Line:35, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriber.java -> No test coverage

-------------------------------------
author: Gustavo Green
date: 2015-03-03 15:01:31.000000000

Patch Set 2:

(7 comments)

Line:52, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitSyncInfoToDiffConverter.java -> Done

Line:68, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitSyncInfoToDiffConverter.java -> The only things we change here are the calls to "local" data, the rest is a copy paste from our super class. I tried to remain as close as possible to that super implementation.

I'll extract the part that can be in another method.

Line:86, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitSyncInfoToDiffConverter.java -> Done

Line:195, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitSyncInfoToDiffConverter.java -> Done

Line:35, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java -> "base", "local" and "remote" is the Team terminology, "base", "ours" and "theirs" is more git-like. I used the git-like here even though this is meant to implement a "team-like" interface. Changed that for coherence :).

Line:18, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/AbstractGitResourceVariant.java -> I haven't tested the equals and hashcode directly, which should be the only thing not covered here.

Line:35, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriber.java -> tests added

-------------------------------------
