DESCRIPTION

Support for symlinks in compare editor

This change makes compare editor works same way the git diff works for
symlinks: it shows *not* the diff between the file or folder contents,
but diff for the symlink target paths.

The compare editor gives a convenient way (given both bug 484498 and bug
484491 patches are merged) to modify symlink target in the IDE, without
using command line tooling.

Bug: 484494
Change-Id: I58d2a5d969886fc00e5aee8f7b83ac57cf6cfa7f
Signed-off-by: Jayvion Booth xxx@xxx.xxx


COMMENTS

author: Douglas Trujillo
date: 2015-12-23 23:00:24.000000000

Uploaded patch set 6: Patch Set 5 was rebased.

-------------------------------------
author: Brenden Conley
date: 2015-12-23 23:00:30.000000000

Patch Set 6: -Verified

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

-------------------------------------
author: Douglas Trujillo
date: 2015-12-23 23:10:16.000000000

Patch Set 6: Code-Review+1

I think we should submit this and fix the Mac unicode encoding problem in another change since this already improves symlink handling a lot compared to earlier versions

-------------------------------------
author: Douglas Trujillo
date: 2015-12-23 23:15:00.000000000

Patch Set 6: Code-Review-1

hit the following exception in new code when refreshing

!ENTRY org.eclipse.core.jobs 4 2 2015-12-24 00:12:38.680
!MESSAGE An internal error occurred during: "Refreshing /Users/d029788/demo/democamp-2015-12/git/lfstest/link".
!STACK 0
java.lang.IllegalArgumentException: Attempted to beginRule: P/lfstest, does not match outer scope rule: F/lfstest/link
	at org.eclipse.core.runtime.Assert.isLegal(Assert.java:63)
	at org.eclipse.core.internal.jobs.ThreadJob.illegalPush(ThreadJob.java:134)
	at org.eclipse.core.internal.jobs.ThreadJob.push(ThreadJob.java:333)
	at org.eclipse.core.internal.jobs.ImplicitJobs.begin(ImplicitJobs.java:85)
	at org.eclipse.core.internal.jobs.JobManager.beginRule(JobManager.java:307)
	at org.eclipse.core.internal.resources.WorkManager.checkIn(WorkManager.java:120)
	at org.eclipse.core.internal.resources.Workspace.prepareOperation(Workspace.java:2189)
	at org.eclipse.core.internal.resources.Resource.refreshLocal(Resource.java:1585)
	at org.eclipse.egit.ui.internal.synchronize.compare.LocalNonWorkspaceTypedElement$1.runInWorkspace(LocalNonWorkspaceTypedElement.java:231)
	at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:39)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55)

-------------------------------------
author: Douglas Trujillo
date: 2015-12-23 23:16:53.000000000

Patch Set 6:

> hit the following exception in new code when refreshing
 > 
 > !ENTRY org.eclipse.core.jobs 4 2 2015-12-24 00:12:38.680
 > !MESSAGE An internal error occurred during: "Refreshing
 > /Users/d029788/demo/democamp-2015-12/git/lfstest/link".
 > !STACK 0
 > java.lang.IllegalArgumentException: Attempted to beginRule:
 > P/lfstest, does not match outer scope rule: F/lfstest/link
 > at org.eclipse.core.runtime.Assert.isLegal(Assert.java:63)
 > at org.eclipse.core.internal.jobs.ThreadJob.illegalPush(ThreadJob.java:134)
 > at org.eclipse.core.internal.jobs.ThreadJob.push(ThreadJob.java:333)
 > at org.eclipse.core.internal.jobs.ImplicitJobs.begin(ImplicitJobs.java:85)
 > at org.eclipse.core.internal.jobs.JobManager.beginRule(JobManager.java:307)
 > at org.eclipse.core.internal.resources.WorkManager.checkIn(WorkManager.java:120)
 > at org.eclipse.core.internal.resources.Workspace.prepareOperation(Workspace.java:2189)
 > at org.eclipse.core.internal.resources.Resource.refreshLocal(Resource.java:1585)
 > at org.eclipse.egit.ui.internal.synchronize.compare.LocalNonWorkspaceTypedElement$1.runInWorkspace(LocalNonWorkspaceTypedElement.java:231)
 > at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:39)
 > at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55)

folder ./lfstest/link contains links to files in folder ./lfstest/ (one level above)

-------------------------------------
author: Brenden Conley
date: 2015-12-23 23:30:04.000000000

Patch Set 6: Verified+1

Build Successful 

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

-------------------------------------
author: Gerrit Johnathan Pham
date: 2015-12-24 00:41:50.000000000

Change has been successfully merged into the git repository by Douglas Trujillo

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