Move UIText and UIIcons to the internal package

These are not part of the API and should therefore not be in a public
package and also not checked for API compatibility.

Change-Id: I8439adce61515177d36227c844d6284de700964f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Show fast forward modes in Merge dialog

Bug: 397835
Change-Id: I0a7da9403656bb883ba258c9c0d0a5438e11e10f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
cleanup FetchGerritChangePage.doFetch()

Change-Id: I43e67dea59da80e3d1875a62d5685dfd98e0c4d6
Update p2f file for installing tools and JGit/EGit dependencies

Update to latest Orbit release and update dependencies.

Change-Id: Ifc92a9c523fd64d7233c890c34686e30f2225145
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Fix unstable DecoratableResourceAdapterTest

It failed in https://hudson.eclipse.org/sandbox/job/egit.gerrit/4256/
because it was using the workspace root as a repository, which can be
pretty unstable due to config files being added/removed.

Convert to a LocalRepositoryTestCase to fix this.

Change-Id: Ic2d0b861f9f069cabb9b0890d1e6c5a92ac67d1c
Add instanceof check to fix unchecked conversion warning

Actually check the elements of the selection to make sure that the cast
is right.

Change-Id: I2ced1ec0ba982eaf6c7be3adf5f06e294e4588d3
Fix warning in ui.test's Eclipse class

WorkbenchContentsFinder is marked @noinstantiate, which results in a
warning by the PDE tooling. The change just inlines the code of
activeWorkbenchWindow, and only executes syncExec once.

Change-Id: Ib2b20a6c1e59d55c82e3fd07a7dd23a08e22d08f
Merge "Update p2f file for installing tools and JGit/EGit dependencies"
Merge "Add instanceof check to fix unchecked conversion warning"
Fix rebase pulldown in toolbar not being accessible during rebase

During rebase, the rebase pulldown menu in the toolbar was always
disabled, resulting in no way to do a "abort" or other actions through
the toolbar.

The problem is that the enabled state of the action handler for the main
action also determines whether the pulldown menu can be opened (the
little arrow besides the icon). So instead of disabling it when rebase
is not possible, also enable it during rebase, and check state again
when executing.

In addition to the above, this fixes RebaseActionHandler's enabled state
to behave the same way as RebaseCurrentRefCommand, in that it's also
enabled with a detached HEAD.

Bug: 387184
JGit-Dependency: I9ec8568fa1100d2e9c8d4ca0e347bf77ec6d8734
Change-Id: Ic69f5c952a49f023c0949f04b3e976be1b267fbe
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Merge "Fix warning in ui.test's Eclipse class"
Fix RepositoryMapping bug on Windows for paths with different devices

The logic in getMapping did not cover the case properly when a path was
totally outside a repository mapping. For example, when workingTree is
"C:\my\working\tree" and the path in question is "D:\a\cloned\repo"
path.makeRelative(workingTree) would return path "D:\a\cloned\repo".
As a result, the if clause is true and the mapping is returned although
the working tree from the mapping is completely unrelated to the path.

A better (and simpler) way is to simply use workingTree.isPrefixOf(path)
for the check. This properly determines if a path is within a working
tree.

The commit also adds a test for detecting the situation.

Bug: 403008
Change-Id: I5ecd9e75beb4da7eb9c36efbe91034067f343344
Signed-off-by: Gunnar Wagenknecht <gunnar@wagenknecht.org>
Signed-off-by: Robin Stocker <robin@nibor.org>
Report dirty worktree failure during rebase

The user really needs this information.

Bug: 375825
Change-Id: I93e294d45b2356723b3f1b74c718722deee8f3ac
Remove away-commented code in RebaseResultDialog

Change-Id: I3b533f3efe95c5274fb36fe4f456631642ac980b
Bump EGit version to 3.0.0 and require JGit 3.0.0

JGit changed version, change EGit too since it's soo heavily dependet
on JGit.

Change-Id: I4927823ff3cd499246b5b85534116cb70015cb9d
[repoView] Enable rebase menu to abort/skip non-interactive rebase

In the Repositories View the rebase menu was hidden when non-interactive
rebase using native git stopped due to a conflict.

Bug: 336820
Change-Id: Ibe204eb9547a99a7ced124475452703130768c9b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Signed-off-by: Robin Stocker <robin@nibor.org>
[sync] Accurate revisions for remote and ancestor

This removes two unused (and outdated) tests in
GitResourceVariantTreeSubscriberTest. The third one was removed since
it was not testing what was advertised: it mocked a use case where the
user was synchronizing a branch with only one commit with a master that
also had a single commit, that thus acted as both the "remote" _and_
"common ancestor" of the synchronization. What we want is a use case
where all three revisions are distinct.

Bug: 393294
Change-Id: I69d4a53e23b7afe916a30b873aada13a6931f4c8
Signed-off-by: Robin Stocker <robin@nibor.org>
Allow users to show server messages while pushing

Allow users to provide their OutputStream (via
PushOperation#setOutputStream)
so that jgit can write server messages to it (via SideBandInputStream)
while they're getting in.

Bug: 398387
JGit-Dependency: I670782784b38702d52bca98203909aca0496d1c0
Change-Id: I1b0f76dba3b2a3eb160ca453c60c6bcf75b5872b
Signed-off-by: Andre Dietisheim <andre.dietisheim@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Increase timeout in GitRepositoriesViewFetchAndPushTest

See https://hudson.eclipse.org/sandbox/job/egit.gerrit/4251/ where the
test failed because of this.

Change-Id: I65ac615d6b7654740578bde3e00bdc84d42b57bf
Merge "Allow users to show server messages while pushing"