Use SWTBot 2.1.0 until hamcrest 1.3 is available in Orbit

Change-Id: I4f729bb7a5e5027b394eab77dded3b7554d41115
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
[stagingView] Fix deletion of files when dragging from Navigator view

In NavigatorDragAdapter, used by the Navigator view, dragFinished
deletes the dragged resources when the operation was DND.DROP_MOVE.

This resulted in the dragged files being deleted when dropping onto the
"Unstaged Changes" or "Staged Changes" in the Staging view.

This was the case even before bug 385412 introduced the possibility to
stage via drag and drop from Package Explorer.

The reason that this bug didn't occur with the Package Explorer is
because it doesn't delete files after DND.DROP_MOVE (which seems like a
more sane behavior).

Bug: 411466
Change-Id: Ibe7891677257d5ff66b7718b728f529134fa5266
Signed-off-by: Robin Stocker <robin@nibor.org>
EGit v3.0.1.201307141637-r

Change-Id: I5ce25010116e08aad6ae7a0d173f5546c19592ba
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Prepare 3.0.2-SNAPSHOT builds

Change-Id: I86267e500569778804dd51f5eb6e0d5a518ef636
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Cleanup directories created by GitMoveDeleteHookTest

Change-Id: Ib537c1c63c755c2db4733bbb0c9bfc0549aa03a7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Allow to inject JVM options for tests run from Maven

Change-Id: I4b7b752350b2d827bffb952c855b5c3b15ba1d02
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Allow to configure custom test directory

On the EGit Hudson server the home directory is located on a NFS share.
This leads to problems when tests which create test files under the home
directory fail to delete files they have created there due to
limitations of NFS.

Hence allow to configure a custom directory for these tests. Set the
system property "egit.test.tmpdir" to specify a custom directory.

Bug: 414509
Change-Id: If549e4c75d53a63f27d33401385b168bd0f236ff
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Ensure that concurrent test runs don't use the same directory

Change-Id: Ia1f63ad4688987cf00ce3b4a1e22d14dbcd28daf
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Fix instability in CommitActionTest

Due to the missing "commit" in testIncludeUntracked and because setup is
only done once per class, tests that followed it could fail.

This also removes some unnecessary code that was copied from other
tests.

See https://hudson.eclipse.org/egit/job/egit-stable.gerrit/50/

Change-Id: I22d02fbc56460c73a22ed3beb0b65bb0e8996e15
Signed-off-by: Robin Stocker <robin@nibor.org>
Fix instability in CreatePatchActionTest

* The cleanup was insufficient as it left some untracked files around
* It relied on the correct patch format being selected, which is not
  always the case depending on test order. Select format explicitly.

See https://hudson.eclipse.org/egit/job/egit-stable.gerrit/50/

Change-Id: Ifcff41f31cb8f2b2cd4adcc5700478b460ee292c
Signed-off-by: Robin Stocker <robin@nibor.org>
Fix instability in GitRepositoriesViewBranchHandlingTest

Same story as previous changes: Make sure we're starting with a fresh
state between tests.

See https://hudson.eclipse.org/egit/job/egit-stable.gerrit/51/

Change-Id: I8f9972f4de57b9758647f63c5e840b0d3dec957a
Signed-off-by: Robin Stocker <robin@nibor.org>
Fix instability in GitRepositoriesViewRepoHandlingTest

The problem was that one test deleted the test directory. If this test
is run before other tests, the other tests fail of course.

This also fixes a problem with the "Show In" test locally.

See https://hudson.eclipse.org/egit/job/egit-stable.gerrit/53/

Change-Id: Ib8f58fd11260938cc7acab4953a47fcd3bf7e237
Signed-off-by: Robin Stocker <robin@nibor.org>
Fix instability in GitRepositoriesViewTest

* Checkout entry is not shown if branch is already checked out
* Make sure original state is restored after checking out other branch
* Don't reuse tree node, sometimes the widget will be disposed because
  it was replaced by another one.

See https://hudson.eclipse.org/egit/job/egit-stable.gerrit/70/

Change-Id: I19f8c17009400848b2880bf5fd1f30dace9af7ef
Signed-off-by: Robin Stocker <robin@nibor.org>
Be more strict in LinkedResourcesTest

Throw exception instead of logging and do not allow "missing local" when
creating linked resources. These could hide the real problem.

See https://hudson.eclipse.org/egit/job/egit-stable.gerrit/74/

Change-Id: I50cadd16bee9a65e77bb069c496c305019fd4b99
Signed-off-by: Robin Stocker <robin@nibor.org>
Fix version.sh to correctly modify dependencies

The script missed to update the egit and jgit feature
dependencies in o.e.e.mylyn.ui.test/pom.xml when setting
a new snapshot version.

Change-Id: I8fd22f51d7e7ab162891cabe448495f1aa46da2c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Auto share multiple projects in single job

When multiple projects are imported together, perform all the necessary
auto shares in a single job rather than spawning a separate job for each
project.

Bug: 410937
Change-Id: I0a2410328da69a73b657afd66fe9efc952809c07
Signed-off-by: Stephen Elsemore <selsemore@collab.net>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Fix NPE when selecting filediff in a merge commit

Bug: 411018
Change-Id: I94d2d15b8cbe1ab2ae0f0a4b4ea2da8dc7850670
Signed-off-by: Stephen Elsemore <selsemore@collab.net>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Update target platform to use Jetty 7.6.11

JGit-Dependency: I76d32444c9cf9f086a013e410a88d37a359272fd
Change-Id: I3f7d43d04dae2b8f7e5d42f25486937646af8732
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Update build to use Tycho 0.18

Change-Id: I4033051e9ffd22b7f6d4b144b4ea85a11037eada
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Fix scheduling rule error when ignoring resources in nested projects

The problem was that IgnoreOperation#calcSchedulingRule and
IgnoreOperation#addIgnore used different methods to get an IContainer
from the IPath. In case of nested projects, this could result in them
getting different IContainers, which lead to an error like "Attempted to
beginRule: /container1, does not match outer scope rule /container2".

To make the test case check the rule, it had to be wrapped in a job.

Bug: 410011
Change-Id: Id03daa1db356b8dbd0b4ad1b07173760b3e1bc75
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>