DESCRIPTION

Preliminary support for ChangeSets

Adds proper representation of git changes that occurs between two ref's.
Changes are displayed as Team ChangeSet instance. All commits are listed
as a child's of node that represent repository. Every commit node
contains tree-list of all changed, added or deleted resources.

Bug: 318473
CQ: 4400
Change-Id: I198bb3859463ee7e0e230e22cf06761391436cd8
Signed-off-by: Malia Sampson xxx@xxx.xxx
Signed-off-by: Leslie Stephenson xxx@xxx.xxx


COMMENTS

author: Leslie Stephenson
date: 2010-08-09 15:32:08.000000000

Uploaded patch set 5.

-------------------------------------
author: Carlie Harper
date: 2010-08-10 12:37:53.000000000

Patch Set 5: I would prefer that you didn't submit this

(9 inline comments)

Please habe a look at the inline comments.

The labels of the left and right compare editor inputs after double clicking a member of a change set are missing. They would be very useful. It took me quite a time to find out how to get them in, so I'll just push this change to gerrit.

Line:35, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelRepository.java -> Whitespace error

Line:1583, org.eclipse.egit.ui/plugin.xml -> whitespace error

Line:1624, org.eclipse.egit.ui/plugin.xml -> whitespace error

Line:102, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelBlob.java -> Please return null here because a three way compare is meaningless in this case.

Line:107, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelBlob.java -> Shouldn't it the other way round? 

The eclipse standard is that the newer version is on the left side.

Line:27, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitChangeSetModelProvider.java -> empty JavaDoc

Line:32, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitChangeSetModelProvider.java -> empty JavaDoc

Line:87, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWithActionHandler.java -> please remove outcommented code

Line:190, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWithActionHandler.java -> whitespace error

-------------------------------------
author: Carlie Harper
date: 2010-08-10 12:49:55.000000000

Patch Set 5:

There is a reproducibly failing test:

org.eclipse.egit.core.synchronize.GitResourceVariantComparatorTest
shouldReturnTrueWhenComparingContainerAndContainer(org.eclipse.egit.core.synchronize.GitResourceVariantComparatorTest)
junit.framework.AssertionFailedError: null
	at junit.framework.Assert.fail(Assert.java:47)
	at junit.framework.Assert.assertTrue(Assert.java:20)
	at junit.framework.Assert.assertTrue(Assert.java:27)
	at org.eclipse.egit.core.synchronize.GitResourceVariantComparatorTest.shouldReturnTrueWhenComparingContainerAndContainer(GitResourceVariantComparatorTest.java:187)

-------------------------------------
author: Leslie Stephenson
date: 2010-08-10 12:56:50.000000000

Patch Set 5:

GitResourceVariantComparatorTest.shouldReturnTrueWhenComparingContainerAndContainer should be fixed by change 1269.

I can merge this fix here if that would preferable.

-------------------------------------
author: Carlie Harper
date: 2010-08-10 13:25:47.000000000

Patch Set 5:

Yes, I think we should not check-in a commit which causes test cases to fail. It may take a long time until the commit fixing the failing test comes in.

-------------------------------------
author: Leslie Stephenson
date: 2010-08-10 13:27:34.000000000

Patch Set 5:

OK, I'll move this change and re-push both patches.

-------------------------------------
author: Carlie Harper
date: 2010-08-10 13:49:14.000000000

Patch Set 5:

Yes, but I have found that with change 1269 I get errors:

- I get suddenly a lot of conflicting changes
- The remote file content of the diff view started from the workspace model contains stuff like "40000 projb" and some unreadable characters

Please check this

-------------------------------------
author: Leslie Stephenson
date: 2010-08-10 17:08:15.000000000

Patch Set 5: (9 inline comments)

All tests are green. I've also add all suggested improvements from comments.

Line:35, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelRepository.java -> Done

Line:1583, org.eclipse.egit.ui/plugin.xml -> Done

Line:1624, org.eclipse.egit.ui/plugin.xml -> Done

Line:102, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelBlob.java -> Done

Line:107, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelBlob.java -> Done

Line:27, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitChangeSetModelProvider.java -> Done

Line:32, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitChangeSetModelProvider.java -> Done

Line:87, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWithActionHandler.java -> Done

Line:190, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWithActionHandler.java -> Done

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