Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-10-13EGit v3.5.1.201410131835-rv3.5.1.201410131835-rMatthias Sohn26-27/+27
Change-Id: I63270cf19870493d092de4bc9832a5f6295eb4eb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-30Fix "Stashes" menu not being shown in Team menuRobin Stocker2-3/+94
This was broken by a later change. This change fixes it and adds a UI test for stashing some changes and applying them using the menu and the stash editor. Bug: 445321 Change-Id: I8251280c4fcc92acbf519b978c43c19fd086c797 Signed-off-by: Robin Stocker <robin@nibor.org>
2014-09-26Prepare 3.5.1-SNAPSHOT buildsMatthias Sohn26-181/+181
Change-Id: If09f97118dd22c11d90bf5d744452f29f01d8996 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-26EGit v3.5.0.201409260305-rv3.5.0.201409260305-rMatthias Sohn26-27/+27
Change-Id: Ia9d235510e8410769fab3932b48859773bf7db2f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-25New EGit project logo (SVG)Robin Stocker1-121/+101
Created in Inkscape based on the Eclipse logo and adding the graph part from the Git logo. This is the source of `org.eclipse.egit/egit.png`. Export to 32x32 was done from Inkscape using -8 for x0 and y0 and 1040 for x1 and y1, to add some additional margin when scaling down to 32x32. Bug: 441460 Change-Id: I1412422764c7132e82fc5a8cbfcd08041d0bb6d5 Signed-off-by: Robin Stocker <robin@nibor.org>
2014-09-24Add EGit Contributor Guide to documentationMatthias Sohn16-1/+1895
Change-Id: Ie00aa9217d94ad532be862e33e734b3dc26d7c82 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-24Update documentation for 3.5.0Matthias Sohn64-236/+371
Change-Id: I6d2af7ea1a3f8674c12fea4e255a33c56f326c26 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-23New EGit project logoMatthias Sohn1-0/+0
The voting for the new logo was held here https://wiki.eclipse.org/EGit/Logo Bug: 441460 Change-Id: Ie3317f6ab6d5e7913b790268f89656f6c806d64d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Also-by: Robin Stocker <robin@nibor.org>
2014-09-20Include word "Edit" in tooltip of "Amend" toolbar buttonRobin Stocker1-2/+2
Maybe that will make more clear what it does, for people that don't yet know what "amend" means. Bug: 443782 Change-Id: I932c65ad37f0b097c32898f58f2b21dd991541c7 Signed-off-by: Robin Stocker <robin@nibor.org>
2014-09-20Extended squash_down.png icon to 16x16 pixelsVadim Dmitriev1-0/+0
Original icon was made 16x15 by mistake. Bug: 443930 Change-Id: I7a38fc113575149d9b5a4df1b523ebbd372feef0 Signed-off-by: Vadim Dmitriev <dmgloss@mail.ru>
2014-09-17Improve icons for interactive rebase fixup and squash actionsMatthias Sohn9-14/+32
- use better icons provided by Vadim Dmitriev - flip direction of the icons when reversing direction of interactive rebase view Bug: 443930 Change-Id: I2d1b99d64d68a1f2d20f0519a375449d83fdd24b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Also-By: Vadim Dmitriev <dmgloss@mail.ru>
2014-09-16Remove use of alternating row colors in some more placesRobin Stocker4-6/+0
See change I50b7c8c66cf391cf5c08b2a29e6bfd14896f17f6 for why. The tables/trees in this change either have no colums or are very simple, so the alternating row colors just add noise. Change-Id: I7aea8910b68d14fc45f7d7c5b58f2596186ad7ac Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-16Fix deadlock caused by GitProjectData.logAndUnmapGoneMappedResourceRobin Stocker3-5/+28
Deadlock could occur as follows: Thread 1: In GitProjectData.get/load, the class object is locked. In case a mapped resource is gone, RepositoryProvider.unmap is called, which waits for job run. Thread 2: In a job run, GitProvider.getData is called, which waits to lock the GitProjectData class. There are also other situations, all of which are caused by logAndUnmapGoneMappedResource calling RepositoryProvider.unmap. By doing that in a job where the GitProjectData class is no longer locked, this should be solved. Bug: 425973 Change-Id: I74ecc26d696057896ac2790974e9c2e9687c783e Signed-off-by: Robin Stocker <robin@nibor.org>
2014-09-14[stagingView] Fix context menu for modified+added fileRobin Stocker3-13/+28
For a file that is not in HEAD, but added to index and modified in the working tree, the context menu was wrong. It was handled just as "modified". Now it's also handled specially like modified+changed. Renamed the PARTIALLY_MODIFIED value to make it clearer. Bug: 443969 Change-Id: I340cf705c5fe78e6796a9a0846f0d00e5c7b4cd1 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-12Add "Repository" submenu in Team menu of files and foldersRobin Stocker3-37/+118
Allows to access repository-wide actions such as Push, Pull, Fetch and Switch To in the context menu of files and folders. Hopefully, having these actions be in a submenu named "Repository" should make it clear that they don't only act on the selected resource, but the whole repository. Bug: 302078 Change-Id: I0045efde5832ad94bbfe0f7b43f654640040ba54 Signed-off-by: Robin Stocker <robin@nibor.org>
2014-09-12Fix Team > Advanced not being available in editor context menuRobin Stocker1-48/+15
Change-Id: Idce172241ef51796f40dd4a323d366470b5d57ff Signed-off-by: Robin Stocker <robin@nibor.org>
2014-09-08Add Team > "Create Patch..." for working setsRobin Stocker4-42/+25
Note that the tooltip attribute only works for toolbar items, that's why it was removed. Change-Id: I9355f43ca8077e73934fe6c6f7bbef80ee19d06e Signed-off-by: Robin Stocker <robin@nibor.org>
2014-09-08Add Team > "Show in History/Repositories View" for working setsRobin Stocker5-76/+37
"Show in History" will focus history on all the projects that are contained in the working set. For Show in Repositories View, it selects the repository, as I felt that having all projects selected was a bit confusing. Bug: 311299 Change-Id: I81ed28ddcfac0174721d07d8cbea9540e36333e2 Signed-off-by: Robin Stocker <robin@nibor.org>
2014-09-07Prepare post 3.5.0-rc1 buildsMatthias Sohn26-27/+27
Change-Id: I3ac0cfa41bbbfd754a5140edb8b3dd39c7cd0055 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-07EGit 3.5.0.201409071800-rc1v3.5.0.201409071800-rc1Matthias Sohn26-27/+27
Change-Id: Ie2c16a527110f0aefe7012950bec6e1830e3695f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-04Simple push wizard links to Advanced push wizardMickael Istria3-0/+32
Filed bug 443320 to track further improvements. Bug: 436726 Change-Id: Iccdecd8eb3f70326a3af99b1fb2a11669f8027b2 Signed-off-by: Mickael Istria <mistria@redhat.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-04Add "Show Annotations" to ruler menu of revision editorRobin Stocker4-17/+93
For a file editor that was opened e.g. from the history view using "Open This Version", the ruler menu now also includes "Show Annotations". It opens the annotations in a new editor, I couldn't figure out how to reuse the same editor. But better than not having it. Bug: 401395 Change-Id: Ida587098137f68110f0885e834c37d3208b85dc5 Signed-off-by: Robin Stocker <robin@nibor.org>
2014-09-04Show a rebase result dialog if cherry-picking fails.Maik Schreiber3-3/+22
This will show a rebase result dialog if cherry-picking a commit fails. This is the same dialog used for regular rebasing. Bug: 443016 Change-Id: I0a88289f74913ccb47ace8ad9d59e9214ae2314a Signed-off-by: Maik Schreiber <blizzy@blizzy.de>
2014-09-03[historyView] Use separate diff viewer instead of embedding into messageRobin Stocker9-285/+171
The diff viewer is the same as in the "Diff" tab of the commit viewer. It still shares its scroll bar with the message. The advantage is that when a file is selected, only the diff has to be updated, not the whole message. We can also make the commit message collapsible or extract other parts from the comment (such as the list of branches/tags). Also, the hyperlink detectors now only run on the commit message, not on the diff. Bug: 440125 Change-Id: I6dc79f75eb0a63dde64cdf33d8e66fc594c327ab Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-03Suppress "Unnecessary cast" errors in Eclipse Mars (4.5)Markus Keller22-81/+82
Bug 430981 changed the API of IServiceLocator#getService(Class) and made casts unnecessary. But we still need to compile against older releases. CommonUtils#getService(..) is a solution that works in both worlds. Bug: 441615 Change-Id: I4ce665fe3f66278f29d8d7e16f083be0e31a3ae8 Signed-off-by: Markus Keller <markus_keller@ch.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-03Disable interactive rebase view action toolbar if selection is emptyVadim Dmitriev2-2/+14
Now action toolbar in the "Interactive Rebase" view is disabled if changeset selection is empty. Before the change toolbar remained active which was misleading. Bug: 441923 Change-Id: I6d4269b8ee72e69a44b1784c725ef9296cb1c5d4 Signed-off-by: Vadim Dmitriev <dmgloss@mail.ru> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-03Update interactive rebase plan row status iconsVadim Dmitriev4-7/+1
"Todo" icon is removed and "checkmark" icon is updated. Change-Id: Ifea5d49ef8229cc18f1c0942076cd371e818313a Signed-off-by: Vadim Dmitriev <dmgloss@mail.ru> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-03Fix inconsistent usage of DND event dataRobin Stocker1-3/+1
The cast check was using a different way to access the data than the cast itself. Change-Id: Ide9507924882d053cd0ef8a8254ddda22184c57b Signed-off-by: Robin Stocker <robin@nibor.org>
2014-09-02Merge "[stagingView] Fix amend message being counted as "user-entered""Matthias Sohn1-5/+9
2014-09-02[stagingView] Fix amend message being counted as "user-entered"Robin Stocker1-5/+9
When clicking amend and then switching to another branch, the amend state and commit message would stay the same. This change fixes it so that after switching to another branch, amend and commit message are reset. I think this is less surprising than keeping amend but updating the message. The other hunk in this change is so that we still preserve the amend state when switching to another repository and back. In case the user has modified the message after pressing amend, it is discarded when switching to another branch. Bug: 441607 Change-Id: I7af1bccde43ccd2048dae6643040170ee4b58c51 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-02Close dialog Team displays on first synchronize with no resultMatthias Sohn1-1/+1
This was missing for CompareActionsTest.textCompareWithHead() causing frequent test failures when test was run from Maven. Change-Id: I2fbd7c886622c3c36819a169a145c9cd7b0cef56 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-02Allow to move multiple commits by DND in the rebase interactive viewVadim Dmitriev1-11/+26
Bug: 443040 Change-Id: I8deca5565d424695c02f2201384bb5abfb8d318e Signed-off-by: Vadim Dmitriev <dmgloss@mail.ru> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-01Handle -m option for Merge commandAxel Richard1-0/+17
Allow to set the commit message to be used for the merge commit (in case one is created) Bug: 442886 JGit-Dependency: Ie5ecc13822faa366f00b3daa07f74c8441cae195 Change-Id: Iebfe419447ab43520d1a7b155de564baa05088ca Signed-off-by: Axel Richard <axel.richard@obeo.fr> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-01Provide more context in cherry-pick confirmation dialogRobin Stocker2-4/+67
Show info about commits to be cherry-picked in tree. This way the user can more easily recognize if they selected the right commits. Bug: 442865 Change-Id: I01d86c8dcbba24389965d3c73b216685b1660ca3 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-09-01Enable linking with merge tool inputRobin Stocker2-2/+26
When the merge tool is open, the package explorer "Link with Editor" action now works when a resource is the input. A nicer solution would be to have ResourceEditableRevision implement getAdapter for IFile/IResource and then delegate to that. But that has strange side effect such as "Save" in the merge tool no longer writing to the file. Change-Id: If9f46c4a3e08578de43d2e6e9fc5a2f0e5e4ff13 Signed-off-by: Robin Stocker <robin@nibor.org>
2014-08-31Commit Dialog: Add "Select for Commit" to files context menuRobin Stocker3-0/+25
This way, multiple files can be marked using Shift+Click and then selected using the context menu. Change-Id: Icc5499ed308ca087a9dd6af1ce2f88f12036a0b4 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-08-30Merge "[repoView] Sort tags in natural order"Robin Rosenberg1-0/+6
2014-08-28Make commit order in the interactive rebase view configurableVadim Dmitriev9-14/+295
History view sorts commits in ascending order (latest on top), while the interactive rebase view sorts in descending order. Now the interactive rebase interactive view has an option to sort commits in ascending order too. Bug: 441925 Change-Id: I00884519258e01eb7e7994029577e29dcaf29f89 Signed-off-by: Vadim Dmitriev <dmgloss@mail.ru> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-08-28[repoView] Sort tags in natural orderAndreas Hermann1-0/+6
Tags containing numbers are now sorted in natural order. In such an order the tag "v1.2" is before the tag "v1.12" instead of the other way round as with ASCII order. Bug: 442238 Change-Id: I367ff6f98740abe20396a33742e93b5e06f92d6b Signed-off-by: Andreas Hermann <a.v.hermann@gmail.com>
2014-08-27Commit dialog: Replace help button with link to Staging viewRobin Stocker4-3/+59
The help that comes up is not about the commit dialog, so showing it only confuses users. Instead, we can use the space to show a link to open the Staging view, to inform the user about the alternative way of committing. Bug: 441795 Change-Id: I616430bc9d0484b17940d679ad9ad14e277ccd7d Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-08-27Don't use alternating row colors for file diff viewerRobin Stocker1-2/+0
Alternating row colors are useful for tables with more than one column, so that it's easier to see which cells belong together. But the commit file diff viewer table only has one column. Looking at other such tables in Eclipse, I couldn't find any that uses alternating row colors. Also, it makes it harder to see which files are greyed out (non-interesting ones), see bug 440979. Change-Id: I50b7c8c66cf391cf5c08b2a29e6bfd14896f17f6 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-08-27Add missing mnemonics to menu itemsRobin Stocker3-20/+24
Change-Id: Ic04734588eddd557d842b58a4b7a3ace18615bd7 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-08-27Fix IAE in Gerrit configuration page on null schemeRobin Stocker1-1/+3
URIish#getScheme can return null, handle it. Change-Id: If2cc15049b449f490f67332b914a271075134847 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-08-27Change "... Git Index" to be consistently "... Index" in actionsRobin Stocker2-14/+14
See http://stackoverflow.com/q/24677225/305973 for the user confusion the previous situation caused. Using "Index" without Git is consistent with the other action names, which are e.g. "HEAD Revision". Change-Id: I00325b7cebfe3ef1914661f547ad755809f080a2 Signed-off-by: Robin Stocker <robin@nibor.org>
2014-08-26Fix repeating message 'Building workspace' in status barSzymon Ptaszkiewicz1-2/+2
In Ibdc454f5ffb290831b81c5e775da35434811454c, many jobs were converted from normal Job to WorkspaceJob. In case of RepositoryChangeScanner which is run every few seconds, this causes the message "Building workspace" to flash in the status bar. The reason for this is that a WorkspaceJob triggers an auto-build, even when no resources were changed. As RepositoryChangeScanner does not change any resources itself, it doesn't need to be a WorkspaceJob (which is for batching resource changed events). So change it back to a normal Job. Bug: 439325 Change-Id: Ic555b868fbda952e7f88a1b851e63af2bb1d6545 Signed-off-by: Szymon Ptaszkiewicz <szymon.ptaszkiewicz@pl.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-08-26Interactive rebase view context menu for plan modificationVadim Dmitriev2-2/+108
Changeset table on the interactive rebase view now has context menu to set rebasing plan for the selected rows. Bug: 441891 Change-Id: I38448abbfd8d104b281aaf69cdf06702a41c3836 Signed-off-by: Vadim Dmitriev <dmgloss@mail.ru>
2014-08-26Interactive rebase view toolbar can incorrectly activate buttonsVadim Dmitriev1-11/+12
Currently interactive rebase view plan toolbar can incorrectly handle changeset table selection changes in case of multiple selected changesets. RebaseInteractiveStepActionToolBarProvider#mapActionItemsToSelection activates corresponding button on the toolbar in case of single selection and can deactivate all buttons in case on multi selection (if selected changesets have different rebasing plans). Current implementation does not handle situation in which another button needs to be activated. For example, if previously selected changeset had "reword" plan ("reword" button activated) and new selection is two changesets with "fixup" plan then expected behaviour is to activate "fixup" button, but actually "reword" button will remain activated. Proposed implementation always activates button corresponding to the first selected changeset plan and deactivates this button if necessary (i.e. selected changesets have different plans). Bug: 441891 Change-Id: Ic6013d2857e8dfc439650692e2ee22031e6f61ec Signed-off-by: Vadim Dmitriev <dmgloss@mail.ru>
2014-08-21[historyView] Context menu item for deleting tagsAndreas Hermann6-0/+186
The entry in the context menu triggers a function with the same features as with the deletion of branches. If there are multiple tags on the selected commit a dialog is shown where the user can selected the exact tags to be deleted. Bug: 441800 Change-Id: I5a9df7b52f0789e04242faf1833484c19494c88a Signed-off-by: Andreas Hermann <a.v.hermann@gmail.com> Signed-off-by: Robin Stocker <robin@nibor.org>
2014-08-21Fix error due to overlapping StyleRanges in CommitMessageViewerRobin Stocker1-39/+25
This was caused by using setStyleRanges in I2cf1e67e23f8d32a5a88b45ea5839f51b90c853a. With the individual setStyleRange method, overlapping was handled by StyledText. By using setStyleRanges for the format job results first (which are ordered and non-overlapping), we still get the better performance of setting these in bulk. The hyperlink style ranges are then applied on top to handle overlapping, but they should be much fewer in numbers. Bug: 440834 Change-Id: I64e1ea37fb409ce21d7ee7fcec8dae01ddec6b7a Signed-off-by: Robin Stocker <robin@nibor.org>
2014-08-20Don't use alternating row colors for staging areasAndrey Loskutov1-3/+0
To be consistent with other similar file viewers in Eclipse we should avoid using alternate colors for simple file lists - they only add visual noise. See also https://git.eclipse.org/r/#/c/31804/ removing alternating row colors for commit file diff viewer. Change-Id: Ida5aaef0d3338433a1c1690bed005275a75b382f Signed-off-by: Andrey Loskutov <loskutov@gmx.de>

Back to the top