Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-08-17Update build to use latest signing pluginMatthias Sohn2-20/+4
See http://dev.eclipse.org/mhonarc/lists/cross-project-issues-dev/msg06366.html Change-Id: I6fdeaf4fb489fb6b37b030d3f0362490419d47c7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-17Support hyperlink detector for Commit idsBenjamin Muskalla19-6/+1067
In order to have better navigation between code and tasks, this hyperlink detector recognizes commit ids inside the task descriptions and lets the user open the corresponding commit in the Commit editor. Change-Id: Ic60d11a45b8cb8cc9383e4120a84eae2f1859e32 Signed-off-by: Benjamin Muskalla <benjamin.muskalla@tasktop.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-17Merge "Extract 'Create Patch' into operation for reusability"Matthias Sohn14-176/+512
2011-08-17Extract 'Create Patch' into operation for reusabilityBenjamin Muskalla14-176/+512
In order to reuse the create patch functionality, it was extracted into it's own operation, purely depending on JGit and decoupled from FileDiff. Also moved functionality for generating a filename for a specific commit into the operation to be reusable. Tests added for the operation. Change-Id: I6ce514ef020eacd42a94496dba80873b8e7f8743 Signed-off-by: Benjamin Muskalla <benjamin.muskalla@tasktop.com>
2011-08-17Fix bug when moving folders into location outside repoStefan Lay1-2/+2
GitMoveDeleteHook incorrectly claimed that it has handled the request without doing anything. A test case and a fix for moving projects will follow once I634d5b44bc7fc6a7453b5d718733c9f8f3542840 is merged. Bug: 354293 Change-Id: Ia93c448e5ae0c574c45ab20a57e759e91c7b70dd Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-16[FindBugs] Fix warnings in GitProjectSetCapabilityRobin Stocker1-20/+14
Makes inner classes static, removes unused code and uses Map#entrySet() instead of keySet() followed by get(). Change-Id: I2ceac1ae704164d03c91d846bd01b07c147eac17 Signed-off-by: Robin Stocker <robin@nibor.org>
2011-08-16Team project set supportRobin Stocker17-0/+1173
This is based on the previous work by Mykola Nikishov in change I800dd9f23953ad903f20289c442707e2dde08f75 ("Import a project set file"). This change includes export support, unit tests, and can handle the situation where different branches of the same repository should be imported. A project reference string in the project set file looks like this: 1.0,git://egit.eclipse.org/egit.git,master,org.eclipse.egit Based on an array of these reference strings, GitProjectSetCapability does the following when importing: - Clone a repository with CloneOperation for each combination of repository URL and branch name. - Import a project from each directory that is specified in the last part of the string ("." if the repository itself is the .project). - Add the repository to the Repositories View. - Connect the projects using ConnectProviderOperation. Due to Bug 244313, import and export of project set files requires the org.eclipse.core.runtime.compatibility plug-in. The dependency is in a separate optional feature, as proposed on the old change. It's required for Eclipse < 3.7. CQ: 5438 Bug: 296082 Change-Id: I1500cc376961117b39b8760e6de675a4885e5f72 Also-by: Mykola Nikishov <mn@mn.com.ua> Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-16Merge "[reflogView] Externalize strings"Matthias Sohn3-4/+22
2011-08-15[sync] Simplify implementation of git remote objectsDariusz Luksza15-587/+328
Simplify implementation of git remote objects by using CachedResourceVariant from team framework. Also do some cleanup in core tests. Change-Id: I32bb63c96676f8213b800558e7d52eb67ae30b2a Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-15Clean up plugin.xmlStefan Lay1-25/+16
Merge the two sections extending "org.eclipse.ui.perspectiveExtensions". This improves consistency and readability. Change-Id: I79e372aa244a7f7a4abc63878ba9a72cedefb421 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2011-08-15Merge "Fix default for Repositories View position"Stefan Lay1-1/+12
2011-08-15[reflogView] Externalize stringsMatthias Sohn3-4/+22
Bug: 354719 Change-Id: I188b812e400fe57cd85383a678558e63b103ac09 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-15Dispose two leaked images in SwitchToMenuRemy Suen1-0/+2
Image instances that are explicitly created need to be disposed of or else SWT will eventually run out of handles and not be able to create new widgets and resources. The images should be disposed of when the contribution item itself is disposed. Change-Id: Ie2d0115b31647f6a37f98ff5b258320492d3aa12
2011-08-14[historyView] Use dispose listener for resources and menuKevin Sawicki1-13/+23
Stops leaking 7 resources and 1 widget in FindToolbar. The menu widget was never explicitly disposed of and the resources were disposed of in an overriden dispose() method that was never called. Bug: 354681 Change-Id: I76988cc2577f9460931e0f7211045fc6d16d38f9 Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-14Disable Rebase... when selection spans multiple repositories.Kevin Sawicki2-9/+17
This makes Rebase... consistent with the Merge... command behavior and also fixes an inconsistency where the Rebase... command would be disabled on repository selections but enabled for project selections from the same repository. Bug: 354176 Change-Id: I4ce60b6d55350c293154ad14dbfcef121687e22f Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-14[reflogView] Populate view with current selectionKevin Sawicki1-3/+14
Use the current selection from the active part to populate the RefLog view when it initially opens. Change-Id: I9030029e9d646a8872ec7bf49659deeb5dc9b7c9 Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-14[reflogView] Update view iconKevin Sawicki1-0/+0
New icon follows the pattern of Error Log view icon. Change-Id: Ifeb1714f63207751f70a0867cd6b5a1556be7933 Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-14[reflogView] Show merge icon for 'merge branch' entriesKevin Sawicki2-0/+6
Change-Id: Ic791a0a84558c01e662df22713c0ac4504697b21 Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-14Only set SWT.BORDER style on message area.Kevin Sawicki1-2/+1
The style bits specified to SpellcheckableMessageArea affect the composite, not the source viewer, and so SWT.WRAP, SWT.V_SCROLL, and SWT.MULTI aren't needed. This was causing double scroll bars to appear on Linux GTK. Change-Id: I9bb8c8345321ab5cc1ec540b310e5f680b9ca3f5 Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-14Don't use saved dialog settings when pull results are empty.Kevin Sawicki1-11/+36
The PullResultDialog does not showing trees or tables when there is nothing to pull so the dialog will typically open too large for the no updates message when it has been previously resized when actual results were shown. The PullResultDialog will open in a smaller packed mode only in the case where there are no fetch, merge, or rebase results. Change-Id: I1895c378a71ef4fe5bef81424c633c9d8de9b309 Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-11Increase JVM memory settings for UI testsMatthias Sohn1-2/+2
UI tests on Indigo hit OutOfMemoryException due to insufficient maximum permspace. Change-Id: I75e162e3f6be444dcd5c763b6983d80feb0239fc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-10Fix default for Repositories View positionMatthias Sohn1-1/+12
Position Repositories View relative to Package Explorer only in Java and PDE perspectives. Bug: 350882 Change-Id: Ibc98e1e2e21b0c85ca525d03a3850856bf2f312b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-10Push result messages should support hyperlinksBenjamin Muskalla2-3/+11
Many code review systems (eg. Gerrit, Smartbear) provide the url to the code review as part of the result message. To help the user easily navigating to the code review, the message area should support hyperlinking. Bug: 337288 Change-Id: I87ef6022dd3804077c392eb6b3def53f7340dd48 Signed-off-by: Benjamin Muskalla <benjamin.muskalla@tasktop.com>
2011-08-10Merge "Fix EPL license files to not contain proprietary bits"Benjamin Muskalla3-954/+753
2011-08-09MultiPullResultDialog: Fix overall status columnRobin Stocker3-28/+11
It would always say "OK" even when the rebase or merge failed. It now displays "Failed" when the status is not successful. Also, the logic for rebase was inverted, leading to the image indicating failure when the rebase was successful. Depends on JGit change Icfc9a9c76763f8a777087a1262c8d6ad251a9068 for isSuccessful. Change-Id: Id3bb809c83464c20b20a93aeae048f9a2edbea63 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-09Fix EPL license files to not contain proprietary bitsMatthias Sohn3-954/+753
Using original license file from http://www.eclipse.org/org/documents/epl-v10.html Change-Id: I65d7607528e29330144fcef0e9b7ec23ea1b4787 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-08[sync] Add fetch changes checkbox into wizardDariusz Luksza6-2/+50
In some cases users would like to overrule egit settings and only for single synchronization turn on/off fetch changes action. This patch enables such possibility. Change-Id: I34b3cba5b0631f787a5bff96624538da1aae1561 Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2011-08-08[sync] Add drag-n-drop (un)staging for Git Change Set modelDariusz Luksza15-51/+351
Adds support for staging/unstaging changes by drag-and-drop from '<working tree>' node into '<staged changes>' node and vice versa. Also changes the behavior of showing '<working node>' and '<staged changes>' node. Now both nodes will be shown whenever one of them contains data. Change-Id: I8db8b95bcd17ad6e7a89169d88f08758a9467d98 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-08[stagingView] Populate view with current selectionKevin Sawicki1-3/+12
Use the current selection from the active part to populate the Staging view when it initially opens. Bug: 349763 Change-Id: I37363b41082a8c4cad51c37d73b64a3183810245 Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-08[stagingView] Update view iconKevin Sawicki1-0/+0
Replaces the current icon with one that is a green downward arrow going into a blue tray. The tray portion of the icon mirrors the Import.../ Export.. icons shown in the File menu. Change-Id: I415df83a76265cd421acc0b83719bd522850b442 Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-08Clean up rebase icon.Kevin Sawicki1-0/+0
Adds the exact same green arrow tip as the pull icon. Previously the rebase icon had a few incorrectly placed pixels near the tip of the arrow. Change-Id: Ib76cc27bf6c6ed151e1265c29a1e5f2ddf7cfccd Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-08[stagingView] Add preference for showing file names firstKevin Sawicki5-60/+137
This option shows the file name followed by the folder that the file is in using the qualifier style. This mode is similar to how libraries/dependencies are shown for projects in the Package Explorer view. This option can be toggled from the Staging view toolbar dropdown menu. Change-Id: I0c731a9b96a50be7e87a74f18013c2df2a0e9555 Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-08Merge "Set initial text of commit selection dialog to 'HEAD'"Matthias Sohn1-2/+5
2011-08-06[sync] Allow synchronize on folder levelDariusz Luksza14-59/+322
When synchronization is launched from folder level, results will only show changes inside this folder. When it is launched from project level it will show changes in whole repository (same as before). Folder level synchronization will always use Workspace presentation model. Change-Id: I937cb2bf870f47e4c3000ae89cd1eb83d0c2d918 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-05Set initial text of commit selection dialog to 'HEAD'Kevin Sawicki1-2/+5
This causes the dialog to open populated with commits instead of being empty and also allows the user to quickly open the latest commit on any repository they have configured in the Git Repositories view. Change-Id: I590726f4fe72413d5b7992b81d1e2d1584bc315b Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-05Staging View: implement additional layoutJens Baumgart4-9/+48
An option "Column Layout" was added to the view menu of staging view. Switching to "Column Layout" changes the orientation of the splitter between the staging list boxes from horizontal to vertical. Change-Id: I49705a690c9f426b7fe0573c962674740d6be0e9 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2011-08-03Merge "Fix NPE in GitLabelProvider.getStyledTextFor"Benjamin Muskalla1-0/+2
2011-08-03[historyView] Reveal selected commit on filter changeRobin Stocker1-4/+2
When looking at the commit history of a resource, a common use case is to select a commit and then wanting to see how this commits fits into the history of the whole repository. With this change, this is now easier because the selected commit is automatically revealed when changing the filter. Bug: 324736 Change-Id: I3ee99773af88cf073315c3f7bf048b0fe2dd694b Signed-off-by: Robin Stocker <robin@nibor.org>
2011-08-03Fix NPE in GitLabelProvider.getStyledTextForJens Baumgart1-0/+2
An NPE occurred in GitLabelProvider.getStyledTextFor when the underlying repository is already deleted on disc. Change-Id: Ie2b01e6b0b0ba786b6cff6b33a7af89be6e97a77 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2011-08-02Merge "Don't specify micro-version for dependency to o.e.c.variables"Benjamin Muskalla1-1/+1
2011-08-02Don't specify micro-version for dependency to o.e.c.variablesMatthias Sohn1-1/+1
We should not depend on the micro-version of plugins to not exclude older platform versions unnecessarily. Bug: 352913 Change-Id: I824827809ec5f9472f6f2fd6f101ac92cbfba501 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-02CompareWithIndexAction: Fix encoding of index elementRobin Stocker2-1/+10
The encoding should be the same as the IFile in the workspace, to not get an incorrect diff. Bug: 345160 Change-Id: I2d81ef9c1b3b6187aafac00a0018bc2d48c1a5eb Signed-off-by: Robin Stocker <robin@nibor.org>
2011-08-01Persist bounds of fetch/merge/push/pull dialogs.Kevin Sawicki5-0/+48
This allows the user to select the ideal size for result dialog sizes. Now that commit messages are displayed in these dialogs they are prone to variable widths. Change-Id: I822254d4dc1ed593dead021086e591beebd3966a Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-01CompareActionsTest: select first line in commit tableJens Baumgart1-0/+1
CompareActionsTest was broken because since 20c95604c253c4607472c39af4f030d82aaaf1be the first commit in CommitGraphTable is no longer preselected. Change-Id: Iba21ab11ec2f12bdb49163679613ef6409fecd86 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2011-08-01Unify label providers in EGitBenjamin Muskalla12-200/+251
Combines all label providers into one GitLabelProvider to have a consistent look&feel across the whole UI. Several label providers were left out that provide a specialized version of common objects for their use-case (eg. search results). Change-Id: Id4c2be70d7d18a70ed928003dd81f36a2928fe58 Signed-off-by: Benjamin Muskalla <benjamin.muskalla@tasktop.com> Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2011-07-31Disable spell check quickfixes if viewer is read onlyBenjamin Muskalla2-10/+41
Currently it's possible to "fix" spelling in read-only editors (eg. commit viewer). Change-Id: I0223d578cdf5061642b3e13af402c92c7e3140a6 Signed-off-by: Benjamin Muskalla <benjamin.muskalla@tasktop.com> Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-07-30Fix NPE on unstaging in initial repositoryJens Baumgart1-3/+6
In an empty repository an NPE occurred on unstaging a file in Staging View. Bug: 352840 Change-Id: If0553656e8b4aac95ce5fb3671fe3d6c0701a4ae Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-07-30[sync] Enable 'Synchronize with Each Other' actionKevin Sawicki1-9/+28
Enable this action on selections of two tag or ref nodes. Change-Id: Ibbccdf4bed8511ac7bc889849ad3d5e03bbbe2f8 Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-07-29Define default for remote connection timeoutMatthias Sohn1-0/+1
Change-Id: Ie88201dc9f4ef0a330902db4046b4544c84edf4b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-07-28Add feature dependencies for EGit Mylyn featureSteffen Pingel1-15/+2
To avoid partial installations of Mylyn or EGit when the EGit Mylyn integration is installed the org.eclipse.egit.mylyn feature should declare feature dependencies. Bug: 353331 Change-Id: If1431980a68a13fa605d9ec328e044c5646e561c Signed-off-by: Steffen Pingel <steffen.pingel@tasktop.com>

Back to the top