Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-09-16EGit v3.0.3.201309161630-rv3.0.3.201309161630-rstable-3.0Matthias Sohn26-27/+27
Change-Id: Ia5cf39b7ef5942aa2a9659f30e4ebed12b4e5e1d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-09-16Ensure that source bundles contain legal files and plugin metadataMatthias Sohn3-0/+15
We missed to add about.html, plugin meta data and options to the source bundles. Change-Id: Idd4e15ed5cb3a30177f173f32000beba645472ff Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-09-11Prepare post 3.0.2 buildsMatthias Sohn26-178/+178
Change-Id: I068cf447edff38cfbd4d18f950c746f1d419fc97 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-09-11EGit v3.0.2.201311090911-rv3.0.2.201311090911-rMatthias Sohn26-27/+27
Change-Id: I61b89c606f9c5037cfa039db8d4a865f6f1c2a28 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-09-11Use JobUtil in AbstractRebaseCommandHandler to avoid code duplicationMatthias Sohn1-39/+28
Change-Id: I468c43e54b67db890147c5f4b401c3ee92e1b1c3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-09-11Schedule a job to abort or skip a stopped rebaseMatthias Sohn3-21/+35
This ensures that the rebase abort or skip operation are executed in the background and that the appropriate scheduling rule acquires a workspace lock so that builders don't interfere. RebaseHelper and AbstractRebaseCommandHandler already behave in this way but the RebaseResultDialog didn't. Bug: 392613 Change-Id: Idae96a7a4bef6b018ec344d78b6d38cd6ab16ab4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-09-05[sync] Fix addition/deletion of incoming commit being reversedRobin Stocker2-80/+75
When a file is added as part of an incoming commit, it should not be shown as deleted and vice versa. I don't know why this was done in the first place. There was also confusion about what the LEFT and RIGHT direction mean in the context of synchronization. The static block in org.eclipse.compare.CompareConfiguration shows that LEFT is incoming and RIGHT is outgoing. Bug: 416374 Change-Id: I4b68e2b35b50fe207180e4313868c1bcfecd87c2 Signed-off-by: Robin Stocker <robin@nibor.org>
2013-09-05Fix showing annotations for deleted file from file diff viewerRobin Stocker2-11/+13
Because getNewPath was used, which returns /dev/null for deleted files, the path could not be found and the following error was shown: File /dev/null is not contained in commit This fixes it by using the old path in case of a delete. Bug: 416554 Change-Id: I34ec04ecda70168a3acf9d34d56520d1a489ed79 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-09-04Prepare post 3.0.2-rc2 buildsMatthias Sohn26-27/+27
Change-Id: Ia28e9ca933863c3d3fa7d71127a207179cb4f395 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-09-04EGit v3.0.2.201309041250-rc2v3.0.2.201309041250-rc2Matthias Sohn26-27/+27
Change-Id: I1f976bd574e6cff8763dd3a3cfda662629ce0bc1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-09-04[historyView] Prevent nested merge and cherry-pickMatthias Sohn2-0/+18
When a merge, cherry-pick or rebase is already in progress the commands merge and cherry-pick need to be disabled since we can't nest these operations. Change-Id: I358e9ef787de93c92ce12d3c9a320ec5dc928e66 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-09-04Update build to use CBI jarsigner pluginMatthias Sohn2-54/+160
The dash signing plugin will be retired soon hence we need to update our build to use the CBI jarsigner plugin for signing build results. Change-Id: I42e4d06bc0e63549096ac46a1bed270b5f038cef Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-09-04Merge "GitSyncObjectCache erroneously changes the sync state of resources" ↵Matthias Sohn4-30/+395
into stable-3.0
2013-09-03GitSyncObjectCache erroneously changes the sync state of resourcesMikaël Barbero4-30/+395
When using the mapping context to determine the synchronization state of individual resources, the GitSyncObjectCache changes all other resources' state to "in-sync"... and never looks back. This causes very weird issues when using Team APIs, and a totally unspecified behavior such as a resource going from "MODIFIED" to "IN-SYNC" for no obvious reason. CQ: 7576 Bug: 415430 Change-Id: Ib9d3686e87a5cb490a55b3a379b81b0fc0b1c3d9 Also-by: Laurent Goubet <laurent.goubet@obeo.fr> Also-by: Robin Stocker <robin@nibor.org> Signed-off-by: Mikaël Barbero <mikael.barbero@obeo.fr> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-09-03Fix compare editor element label for "file not in commit"Robin Stocker1-1/+1
Passing the commit object results in toString of RevCommit to be used, which is not for display in the UI. Change-Id: Id96308c8db2d0930d3f342b5c8b8009de34b6131 Signed-off-by: Robin Stocker <robin@nibor.org>
2013-09-01RepositoryAction: Only calculate isEnabled if relevant selection changesRobin Stocker1-6/+14
When selecting text in a text editor or moving the cursor, selectionChanged is called many times with an ITextSelection. In case of a text selection, we are only interested in which file the selection is in. To get rid of some unnecessary cycles, only calculate isEnabled if the selection changed after the interesting parts are extracted. Bug: 415958 Change-Id: I52416d0386a60d15b19d0a32755b016c2f3419eb Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-31Add refresh of linked folder to LinkedResourcesTestRobin Stocker1-0/+3
Maybe this will fix the occasional failures on Hudson: https://hudson.eclipse.org/egit/job/egit-stable.gerrit/155/ Change-Id: Ia175a29fe9df0fe12cc67a0be974aed877264e31 Signed-off-by: Robin Stocker <robin@nibor.org>
2013-08-30Fix inefficient implementation of GitScopeOperationRobin Stocker3-49/+132
The problem before was that it executed an expensive "git status" operation for each resource, even when the resource was in the same repository. It now processes the resources grouped by repository and uses the cached index diff data from IndexDiffCache. Bug: 412503 Change-Id: Ic7b38a93f8675656c081361e32446528587e6d22 Signed-off-by: Robin Stocker <robin@nibor.org>
2013-08-30[historyView] Prevent nested rebaseMatthias Sohn2-2/+17
Disable rebase when repository is not in a safe state. This prevents calling rebase when there is already a rebase, merge or cherry-pick in progress. Also safeguard against broken handlers which may miss to become disabled when not in a safe repository state in order to prevent that nested rebase gets aborted since this could destroy the work done while resolving conflicts in the first rebase. Throw an IllegalStateException in this case. Bug: 416136 Change-Id: I05054b6c7f6a49f4cd01d70ee44791e6985e9ee5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-28Fix sorting of files in commit dialog treeRobin Stocker1-11/+9
This was broken when changing the table to a tree with bug 366175. Fix the ClassCastException and add a test case. Bug: 412359 Change-Id: I97cda72e102f519c1e66c8e36c383f94b9cdf3df Signed-off-by: Robin Stocker <robin@nibor.org>
2013-08-27Update to Orbit Kepler SR1 release R20130827064939Matthias Sohn3-30/+41
Also update p2f tools installation file accordingly. Change-Id: Iaf3487e3ab938dbf923bbdeb2f212de13a397a39 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-23Improve usability of "Create New Tag" dialogRobin Stocker2-79/+82
* Use hints to have a sane size after opening dialog without having to hardcode minimum size * Make sure advanced content becomes visible when expanded * Instead of changing "enabled" state of text widgets, change "editable". This makes it possible to always select text. * Always enable editing of tag name field, even after existing tag was selected. This allows to select an existing name and then edit it, which is useful for version numbers where only the last part changes. * Use the same key stroke to activate "OK" as in staging view * Add a "clear" icon to the tag name text field * Also allow to replace an existing tag when its name was entered in the tag name text field. Before, this was only possible when selecting it on the right. This also removes some unused code and releases a RevWalk. Bug: 352830 Change-Id: I655ca714667a5ef24a584e41e0c1b3bbe80da949 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-23Lookup keybinding used to trigger content assistMatthias Sohn4-49/+60
EGit hardcoded the keybinding for content assist to "CTRL+Space". Instead it should dynamically lookup the configured keybinding. Bug: 415133 Change-Id: I7ea30a5e162d6e7e63e8d220ed514f3af4366e27 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Robin Stocker <robin@nibor.org>
2013-08-23Decorate repositories view logoMatthias Sohn1-0/+0
We need to differentiate the Git repositories view's icon from the one used by CVS. Bug: 414189 Change-Id: I7625c4067e22871408e9153ee3f47e680cf7b4d6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Robin Stocker <robin@nibor.org>
2013-08-23[repoView] Make "Delete Repository..." more explicitRobin Stocker6-49/+132
It now requires the user to explicitly check that the .git dir should be deleted before the dialog can be confirmed. It also displays a warning that the deletion is permanent and changes some labels for clarity. The paths are now shown below the checkbox for better alignment and to make them selectable (see "Delete Project" where this is also done). Bug: 395351 Change-Id: Ia1b95ecc1244e4dd622a0e6b77f665d13327ac80 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-23Make sure Comparator implementation does not violate contractRobin Stocker1-1/+6
This is a follow-up to I7591ce439dc8e3719965a4516c9eb4692cfd5acb for making sure the following contract is ensured: Finally, the implementor must ensure that compare(x, y)==0 implies that sgn(compare(x, z))==sgn(compare(y, z)) for all z. Change-Id: If08b9f0e7c3b2c6e40efd2b1ae1fdd508c867738 Signed-off-by: Robin Stocker <robin@nibor.org>
2013-08-23Fix NPE in CommitMessageComponent#setDefaultsRobin Stocker1-6/+7
Repository does not yet have to be set to a non-null value, so check for null in setDefaults. Bug: 380782 Change-Id: I0f788cf022dd970acd06b56e1e58d90ddd9200c9 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-23[repoView] Ask whether to remove/delete repo when pressing DeleteRobin Stocker4-2/+77
Before, it would always show the "Delete Repository..." dialog. Now it's more like other Eclipse behavior in that the Delete key also offers to just remove the selection without deleting anything. Bug: 395351 Change-Id: I93e1efa4308a6a2939f82b258c63215fda5a63b4 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-23Fix instability in MergeToolTestRobin Stocker6-97/+142
It recently failed here: https://hudson.eclipse.org/sandbox/job/egit.gerrit/4746/ The problem was that the "ancestor" text editor was sometimes shown and returned as the first text editor, where the code expected to get the "left" editor. As the sync view tests also use the compare editor, abstract this in a new CompareEditorTester which handles this. Change-Id: I82e731f4166c5cf060a8f441b02a6067961630bf Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-23Don't automatically connect projects in /, /home or /home/usernameRobin Stocker1-11/+27
See bug 393332 and 414629. If that's really what the user wants, it's always possible to connect it manually via Team > Share Projects... Bug: 393332 Bug: 414629 Change-Id: I0267a35950724512f7193eebf9316c737cb36a53 Signed-off-by: Robin Stocker <robin@nibor.org>
2013-08-23Extract method in AutoShareProjects to reduce nestingRobin Stocker1-40/+44
Change-Id: Ic80fee702f37792d766c362d0645f7774940239b Signed-off-by: Robin Stocker <robin@nibor.org>
2013-08-23Extend labels of sources in Import Projects from GitRobin Stocker4-4/+6
"Local" and "URI" are not very clear. E.g. when the user wants to clone a local repository, the right choice would be "URI", not "Local". So use "Existing local repository" and "Clone URI" instead. Change-Id: I7fccffead439c91665d38bde6f49db96d9fe91e6 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-22Fix potential NPE from passing null as progress monitorLaurent Goubet1-1/+2
Even though the javadoc advertizes it, a few model providers will not accept "null" as a progress monitor. Use the NullProgressMonitor instead to be on the safe side. Change-Id: Ie4aa950b970297185b0488adadfc791d429eb364 Signed-off-by: Laurent Goubet <laurent.goubet@obeo.fr> Signed-off-by: Robin Stocker <robin@nibor.org>
2013-08-22Consider IResource.getLocation() being nullChristian Georgi2-9/+16
For non-local projects, i.e. ones backed by other EFS implementations, IResource.getLocation() is designed to return null (cf. getLoactionURI()). Honor this fact by checking return values of getLocation(). Bug: 413887 Change-Id: I7591ce439dc8e3719965a4516c9eb4692cfd5acb Signed-off-by: Christian Georgi <christian.georgi@sap.com>
2013-08-22Fix scheduling rule error when ignoring resources in nested projectsRobin Stocker2-5/+46
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>
2013-08-22Update build to use Tycho 0.18Matthias Sohn1-2/+2
Change-Id: I4033051e9ffd22b7f6d4b144b4ea85a11037eada Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-22Update target platform to use Jetty 7.6.11Matthias Sohn3-51/+51
JGit-Dependency: I76d32444c9cf9f086a013e410a88d37a359272fd Change-Id: I3f7d43d04dae2b8f7e5d42f25486937646af8732 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-22Fix NPE when selecting filediff in a merge commitStephen Elsemore1-0/+5
Bug: 411018 Change-Id: I94d2d15b8cbe1ab2ae0f0a4b4ea2da8dc7850670 Signed-off-by: Stephen Elsemore <selsemore@collab.net> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-22Auto share multiple projects in single jobStephen Elsemore1-5/+17
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>
2013-08-22Fix version.sh to correctly modify dependenciesMatthias Sohn1-0/+16
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>
2013-08-21Be more strict in LinkedResourcesTestRobin Stocker2-8/+7
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>
2013-08-21Fix instability in GitRepositoriesViewTestRobin Stocker1-3/+5
* 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>
2013-08-21Fix instability in GitRepositoriesViewRepoHandlingTestRobin Stocker6-102/+91
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>
2013-08-21Fix instability in GitRepositoriesViewBranchHandlingTestRobin Stocker1-97/+75
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>
2013-08-21Fix instability in CreatePatchActionTestRobin Stocker3-58/+31
* 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>
2013-08-21Fix instability in CommitActionTestRobin Stocker1-27/+3
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>
2013-08-20Ensure that concurrent test runs don't use the same directoryMatthias Sohn1-1/+10
Change-Id: Ia1f63ad4688987cf00ce3b4a1e22d14dbcd28daf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-20Allow to configure custom test directoryMatthias Sohn6-19/+38
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>
2013-08-19Allow to inject JVM options for tests run from MavenMatthias Sohn3-1/+7
Change-Id: I4b7b752350b2d827bffb952c855b5c3b15ba1d02 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-19Cleanup directories created by GitMoveDeleteHookTestMatthias Sohn1-0/+1
Change-Id: Ib537c1c63c755c2db4733bbb0c9bfc0549aa03a7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

Back to the top