Remove erroneous trailing " from "Replace with ref" dialog title

Change-Id: Id708bc56e8d095b168cba329bfe85bbe2fa89a35
Don't show full resource path in compare/replace with ref dialogs

Otherwise the dialog can get too wide for long paths.

Also fix the title for "replace with ref" when multiple resources are
selected.

Bug: 363431
Change-Id: If27c3c990210d30f2fb42c257e9213f7982eaa49
Restore previous commit message when amend is deselected

Sometimes the user clicks on amend by accident, which would cause the
carefully crafted commit message to be replaced by the amended message.

Now it is saved when selecting amend and restored when deselecting
again.

The pre-amend message is reset when the commit message component is
reconfigured, so it won't survive a repository switch in the staging
view. But for the accidental click it's enough.

Bug: 364022
Change-Id: Icdf56dec24459aa66cc9bf8ab70aa957de39c31d
Fix invalid not well-formed plugin.xml

It's unclear why PDE accepts such mal-formed plugin.xml.

Change-Id: Ia51879450306759654eab9e0fdd7eb64d627a46a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Merge "Don't show full resource path in compare/replace with ref dialogs"
Merge "Restore previous commit message when amend is deselected"
Remove no longer needed org.eclipse.egit.psf-feature

It was necessary for Eclipse < 3.7 because of bug 244313. Now that 3.5
and 3.6 are no longer supported, we don't need it anymore.

Bug: 365425
Change-Id: I3921826a34eff58e9785d888445e93401eeeece7
Remove 3.5 (Galileo) and 3.6 (Helios) target platforms

Bug: 365425
Change-Id: I25c96554cfacb869d7d36962c1c85559998feec8
Remove redundant and illegal implementation of IFileRevision

The changed classes all extend GitFileRevision, which extends
FileRevision, which implements IFileRevision. So the implements is
redundant. It also causes warnings because IFileRevision is
@noimplement.

Change-Id: I3520bc4a9e5eedba7440bb58d0202eaed4ca489e
Update egit.psf team project set

Change-Id: I8ea59a4915dee73305285989ff0c6979baa76fe6
Abbreviate commit ID in merge editor labels

This matches what is done in other compare editors.

Change-Id: I297d5444c4d8b665bdce588bb114db6ece5decd6
BranchRenameDialog: Test for invalid ref before resolving it

The revision parser was made stricter in JGit, so resolving "foo/" now
throws a RevisionSyntaxException (see also bug 393227).

Fix this by moving the isValidRefName check before the "ref already
exists" check.

Bug: 393914
Change-Id: Id074c4f987302c3fe1885c9e5fec1d37005bd8f9
[repoView] Move getPath to RepositoryTreeNode and subclasses

This way, it can be reused outside of the
RepositoriesViewCommandHandler.

Change-Id: I59671cfe1e9833723b05f5af00c89df43211fb1f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Use three-way mode of the compare editor

When the user compares versions which are not direct descendants of
each other it is useful to see the content of the common ancestor.
This change introduces the usage of the three-way compare editor.

Three-way compare is still not supported when the user compares folders
or projects. This would have to be implemented in the CompareTreeView.

Change-Id: Ied1fa51d3a1ec9136ec270ff8500e08a32629fce
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Compare using model provider if possible

The previous implementation of 'asCompareInput' hijacked any comparison
using model providers through the synchronize view. Even when
double-clicking on files that are part of a model, only the "git" model
would have been allowed to provide comparison input. This commit
modifies to implementation to prefer the model input if available.

Bug: 393225
Also-by: Gunnar Wagenknecht <gunnar@wagenknecht.org>
Change-Id: I69c3e36b74f8eee7755a55ec9f8f4cc42149fef7
Improve support for logical models in Compare With operation

When comparing a file with another branch, tag or reference, take the
model providers into account and launch the synchronize perspective
instead of comparing the single, selected file into a compare editor
if this file is part of a model spanning more than one resource.

Bug: 393225
Change-Id: Id113b941afa44109b899c17957baa053bd75158f
Also-by: Gunnar Wagenknecht <gunnar@wagenknecht.org>
Signed-off-by: Gunnar Wagenknecht <gunnar@wagenknecht.org>