DESCRIPTION

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'.

Change-Id: Ieda23bb556d342f421f03b93c7faa160998598aa
Also-by: Gustavo Green xxx@xxx.xxx
Also-by: Karter Mora xxx@xxx.xxx
Signed-off-by: Maleah Marks xxx@xxx.xxx


COMMENTS

author: Maleah Marks
date: 2015-03-27 17:21:25.000000000

Uploaded patch set 8.

-------------------------------------
author: Brenden Conley
date: 2015-03-27 17:21:32.000000000

Patch Set 8:

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

-------------------------------------
author: Brenden Conley
date: 2015-03-27 17:41:17.000000000

Patch Set 8: Code-Review-1

Build Unstable 

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

-------------------------------------
author: Douglas Trujillo
date: 2015-03-28 00:39:35.000000000

Patch Set 8: Code-Review-1

(8 comments)

Line:283, org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java -> you can close the try block after line 283 since then you don't need the revwalk any longer

Line:284, org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java -> why a NameConflictTreeWalk ?

Line:313, org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java -> why a NameConflictTreeWalk ?

Line:347, org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java -> why a NameConflictTreeWalk ?

Line:62, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/AbstractGitResourceVariant.java -> funny, this should also work when there is no separator in the path since -1+1=0 :-)

Line:86, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java -> would look nicer as the first case in this switch statement

put the comment on an extra line after case statement

Line:87, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java -> I think "default:" isn't needed since there's no other stage

Line:59, org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProviderTest.java -> you can close the try block after line 59 since then you don't need the revwalk any longer

-------------------------------------
author: Douglas Trujillo
date: 2015-03-28 00:41:12.000000000

Patch Set 8:

(2 comments)

Line:28, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriber.java -> s/an/a/

Line:32, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriber.java -> I guess you mean a remote tracking branch

-------------------------------------
author: Maleah Marks
date: 2015-03-30 07:47:27.000000000

Patch Set 8:

(10 comments)

Thanks for the review Matthias!

I took most of your coments into account, I just have a few questions.

Line:283, org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java -> I thought of that, but I'd have to declare the 3 RevTree variables before the block, it would add lines for nothing.
Do you want me to do it anyway?

Line:284, org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java -> Argh. Copy/paste...
Done.

Line:313, org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java -> Done

Line:347, org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java -> Done

Line:62, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/AbstractGitResourceVariant.java -> Yes, I did that on purpose actually ;)

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

Line:87, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java -> I would let it and throw an IllegalStateException then, It seems the safest way of handling that. Is that ok for you?

Line:59, org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProviderTest.java -> Same question: Do you want me to declare the RevTree variables before?

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

Line:32, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriber.java -> No, actually we just meant "branch" instead of "remote branch".

-------------------------------------
author: Douglas Trujillo
date: 2015-03-30 22:57:14.000000000

Patch Set 8:

(6 comments)

Line:283, org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java -> you are right

Line:284, org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java -> where ? you didn't push a new patchset

Line:62, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/AbstractGitResourceVariant.java -> :-)

Line:86, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java -> where ? you didn't push a new patchset

Line:87, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java -> ok

Line:59, org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProviderTest.java -> you are right, no need to change this

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