Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-09-19Prepare 2.1 maintenance buildsstable-2.1Matthias Sohn32-38/+38
Change-Id: I2503202c62684390e152b4a2bc8347e6da896f77 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-09-19EGit v2.1.0.201209190230-rv2.1.0.201209190230-rMatthias Sohn32-38/+38
Change-Id: I3ccc4e6de0771e44023c25916ba97e301d32ce18 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-09-18Update documentation for 2.1Matthias Sohn36-313/+682
Change-Id: I994f207032da7c325ac59f575405786550bc66fe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-09-17Handle newly introduced ParseExceptions thrown by GCChristian Halstrick1-0/+4
When the JGits garbage collector can't parse some configuration parameters he will throw a ParseException. These exceptions have to be catched and wrapped. This change needs JGit change Ib3c1aa64b65ed0e0270791a365f2fa72ab78a3f4. Change-Id: I6e8945debf665db68f86cff2910a5e627382182a
2012-09-10Use the editor input from the given contextDani Megert3-15/+44
Bug: 387633 Change-Id: Ic43c820697c103ddbfd65494dddb7706c6210386 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-09-08Ensure consistent ignore handling compared to cgitMatthias Sohn6-72/+1
EGit considers derived resources as if they were mentioned in .gitignore. This looks like a nice Eclipse integration on first sight, but it causes trouble when git is used on the command line (since derived resources are not ignored there). This might also break consistency when some developers use a different type of IDE or editor which doesn't share Eclipse's opinion about which Resources are derived. Fix this by no longer considering this hint provided by the Team framework. Bug: 359052 Change-Id: Ida2be440382b74715644e55fce9e8572ad0a8336 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Robin Stocker <robin@nibor.org>
2012-09-07Fix Compare With > HEAD of project for initial commitRobin Stocker3-2/+22
A message is shown informing the user that it's not possible. Another solution would have been to allow it and compare with an empty tree, but that is too much effort to get right for a minor edge case. Bug: 389008 Change-Id: I9701383ef7c5379a25af2ba8c5de0f17e00eb0c9 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-09-06Fix file compare in Commit dialog for initial commitRobin Stocker2-37/+34
The code from the fix for comparing index with HEAD (Ib99e822c) is moved to CompareUtils and reused in compareHeadWithWorkspace and compareHeadWithWorkingTree. Bug: 388929 Change-Id: I4b562b65c31a4d661bfd4438055a779437b1741f Signed-off-by: Robin Stocker <robin@nibor.org>
2012-09-06Rename getHeadTypedElement to getIndexTypedElementRobin Stocker5-7/+8
getHeadTypedElement is confusing because it doesn't give HEAD, but a typed element for the Git index. This is a preparation for the next commit, which introduces getHeadTypedElement for HEAD. Bug: 388929 Change-Id: I52b95c9b9a2059698fabd78a6e406c9d4ea3906d Signed-off-by: Robin Stocker <robin@nibor.org>
2012-09-06Merge "README: Convert to Markdown and rename to README.md"Chris Aniszczyk1-27/+35
2012-09-06Fix painting of checkboxes in table on GTKRobin Stocker1-3/+10
Before, there was just a black/white area instead of a checkbox. How to verify: * Open Team > Remote > Push... * Click Next * Click "Add All Branches Spec" * "Force Update" checkbox should be rendered correctly and toggleable Adding an explicit call to composite.print(gc) and drawing to an image fixes it. Maybe the changes in SWT bug 354978 broke what apparently worked before. Also make sure that there is no margin/spacing between the drawn buttons, otherwise borders end up in the cut up images. Bug: 380832 Change-Id: I199a231bfba6bd95be16b46fcf37f668f9913d15 Signed-off-by: Robin Stocker <robin@nibor.org>
2012-09-05README: Convert to Markdown and rename to README.mdRobin Stocker1-27/+35
This makes it display nicely on the GitHub mirror repository. And it is still very pleasant to read in plain text. Also corrects old spellings "GIT" and "egit". Change-Id: Id77ab89c57f021eb8cd39c226fec71c1a498520c Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Chris Aniszczyk <zx@twitter.com>
2012-09-05Improve performace when entering invalid name in Create Branch dialogSteffen Pingel1-6/+17
This change improves performance on Gtk when entering invalid branch names: * Do not re-layout controls unless the layout has changed. * Invoke setErrorMessage() only once during validation to avoid updating of the layout more than once. Bug: 352253 Change-Id: Id24a951dafe4eed24c40a2d18d681882c13369d2
2012-09-05Merge changes I78435caf,I70eea050,Ia8e4f6ae,I354875b4Matthias Sohn3-28/+20
* changes: [stagingView] Only show commit shortcut in tooltip when it works [stagingView] Allow <any modifier>+Enter for commit Remove unnecessary handling of Ctrl+Enter in CommitDialog Remove special casing of Tab without modifiers for traversal
2012-09-05[stagingView] Only show commit shortcut in tooltip when it worksRobin Stocker1-5/+15
Otherwise the expectation may be that the shortcut always works, regardless of focus. But it only works when the commit message text widget has focus. Bug: 386843 Change-Id: I78435caf30067e983cc7ed55b3c9fae1f3c5c87f Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-09-05[stagingView] Allow <any modifier>+Enter for commitRobin Stocker1-4/+5
This makes it consistent with the Commit dialog and other text fields. Bug: 386843 Change-Id: I70eea050fc51726f9164a17270e8836c677cc4f4 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-09-05Remove unnecessary handling of Ctrl+Enter in CommitDialogRobin Stocker1-11/+0
It already works without this. Maybe it was needed before the widget was a StyledText. Bug: 386843 Change-Id: Ia8e4f6ae19a0b58b56b393698a686280805dc858 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-09-05Remove special casing of Tab without modifiers for traversalRobin Stocker2-8/+0
The default of Ctrl+Tab already works without this, and there's no reason for deviating from the default traversal method here. Bug: 386843 Change-Id: I354875b430e5dbc0802e80115f956aa1655e68c8 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-09-05Merge "[findBugs] Silence serialization warnings"Robin Rosenberg1-0/+9
2012-09-05[sync] Restore configured synchronization after eclipse exitDariusz Luksza5-2/+185
Now synchronization configuration is persisted between eclipse sessions. Users can also "pin" configured synchronization. Bug: 354829 Change-Id: I2f24b557e77e6ed155f206056ca1a24d4827ecd1 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-09-05Use headline style for 'New Branch...' push buttonDani Megert1-1/+1
Change-Id: I299ee4268ef229b7271c19349e07c609777fa9d8 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
2012-09-05Fix NPE in CompareTreeView.reactOnOpenDani Megert1-8/+12
Bug: 388816 Change-Id: I40b704b61e0abd976bed7c7f5c77b731f18b2d19 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
2012-09-04Allow users to push to upstream when committingAndré Dietisheim6-3/+115
I added a checkbox to the commit dialog that allows a user to commit and push to upstream in a single step. Bug: 330048 Change-Id: Ic5a9c42c2c5ab5e6ba86ee0e0098507f8cd31d9f Signed-off-by: Andre Dietisheim <adietish@redhat.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-09-04Don't show context menu if the selection is emptyDani Megert1-4/+7
Change-Id: I690d1c0b36e925891b5f33e8eca7a15caacfa908 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
2012-09-03Fix conflicting and add missing mnemonicsDani Megert1-6/+5
Change-Id: I437028cf6db80b6899979a2a679d78009e9b1b91 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
2012-09-03Add context menu to Tree Compare and provide a selectionDani Megert3-2/+141
Bug: 355637 Change-Id: I98d10a4aa3a9b03ec8f46b2b2373c83e2e078192 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Robin Stocker <robin@nibor.org>
2012-09-03Merge "Fix NPE when comparing index with HEAD for initial commit"Stefan Lay1-5/+11
2012-09-03Merge "Correct encoding for compare views of Tree Compare"Stefan Lay2-14/+14
2012-09-02[historyView] Rebase: Pass a better Ref as upstreamRobin Stocker4-9/+75
JGit change I1333a8dd170bb0077f491962013485efb6f2a926 is about improving the ours/theirs conflict markers during rebase. The way the rebase action worked before, it would always pass the commit ID to rebase, which is not very helpful during a rebase conflict. This change makes it use a Ref if there is one. If there are multiple refs pointing to the selected commit: - and if the branch being rebased tracks another one, this tracked branch should be the one to pick if it's in the list - otherwise pick a remote tracking branch if it's in the list Also adds a "does it work at all?" test for rebase in History view. Bug: 336819 Change-Id: Ib78c3e8965e2f57e2c844a065629511ab1158160 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-09-02Merge "Improve layout of decorator preference page"Matthias Sohn1-17/+15
2012-09-01Improve layout of decorator preference pageRobin Stocker1-17/+15
- Move links into general tab, to save vertical space (in the CVS decorator preference page, they are also there) - Only fill lower part vertically (top part doesn't need more space) The description label had to be moved to createContents because it was causing layout issues. Change-Id: Iaa1002d69cb7b2fa3f80e52b8b42b1e07a5eb6d1 Signed-off-by: Robin Stocker <robin@nibor.org>
2012-09-01Make Show In > Git Repositories work for more than one selectionRobin Stocker1-69/+87
Bug: 388405 Change-Id: I82fa69df43dc80e783aaca37055c11961e43d5e0 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-09-01Add link to 'Colors and Fonts' on decorator preference pageDani Megert3-1/+10
Bug: 359230 Change-Id: Ia208a14566b53a1959970c1a616a49480e00c3e4 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-09-01Merge "Expand LF to CRLF in input to compare editors."Matthias Sohn2-3/+16
2012-09-01Fix HistoryPage not to crash in the light of incorrect refsChristian Halstrick1-5/+11
If a ref pointed to an unknown object then this caused the history page not to be filled at all. We should simply ignore incorrect refs when displaying the history. Change-Id: Iab9cd83e70527eb9971617160681936c66a7c493 Signed-off-by: Robin Stocker <robin@nibor.org>
2012-09-01Expand LF to CRLF in input to compare editors.Robin Rosenberg2-3/+16
This modified BlobStorage which often used as a source to the compare editor. This eliminated bogus line ending changes when autocrlf is true. It will not help when autocrlf is input and the worktree version has LF only line endings. Bug: 387501 JGit-Change-Id: I2e200a33d6d3ac24ae8c149718157a66176c5932 Change-Id: I2e200a33d6d3ac24ae8c149718157a66176c5932
2012-09-01Add a statistics page to repository propertiesChristian Halstrick5-0/+159
When a user opens the properties of a repository (Git Repositories View-> right-click on a repository node -> Properties) a new page is added to the Component. This page "Statistics" contains info about the number and size of loose and packed objects. Also the number of loose and packed refs and the number of packfiles are listed. Change-Id: I61281be7db512ccdf5399c98a90b39000365dd71 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-08-31Add missing copyright statementsRobin Stocker2-0/+2
As requested in I142a5f20b35f98675b90170dc1328ea637468c06. Change-Id: I5f3472e8a1eb68258dad58a0235726768c84b30e Signed-off-by: Robin Stocker <robin@nibor.org>
2012-08-31Merge "Show problem decorations in staging view and commit dialog"Dani Megert6-15/+270
2012-08-30Correct encoding for compare views of Tree CompareRobin Stocker2-14/+14
When the Tree Compare was opened for comparing files from two commits, the default encoding was used for the individual file compare views. Now it tries to get a better encoding through CompareCoreUtils.getResourceEncoding, as we do in other places. Also, to discourage the use of FileRevisionTypedElement without specifying an encoding, the constructor without encoding is removed, as the last usages of it were in Tree Compare. Bug: 388425 Change-Id: I27c5d715905b65534c24bbced88d95403d4434a0 Signed-off-by: Robin Stocker <robin@nibor.org>
2012-08-30Fix NPE when comparing index with HEAD for initial commitRobin Stocker1-5/+11
Before the initial commit, HEAD's object ID is null, so use an empty element in this special case. Change-Id: Ib99e822c34607ec9cefd825ba94b91fec0c7f331 Signed-off-by: Robin Stocker <robin@nibor.org>
2012-08-30Improve error message logged when mapped resource is goneMatthias Sohn3-14/+34
Change-Id: Ic7c7cac158b7ded89728b2b1e682985ee00d6094 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Robin Stocker <robin@nibor.org>
2012-08-30Move 'Open Commit Viewer' closer to other open commandsDani Megert1-3/+6
Bug: 388206 Change-Id: I6ee606f902d4b54503b00c2c0a0270dd4f1a7d89 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-08-29Prune deleted repositories from RepositoryCacheAndré Dietisheim2-12/+66
RepositoryCache is not removing repositories that were deleted. When queried it will deliver old entries for a new repo created at the very same path. I now remove dead repos when they're looked up and when all repos are requested. Bug: 387617 Change-Id: I8c27f63ccb3b8d6465d3153d77a7459ca909c0f9 Signed-off-by: Andre Dietisheim <adietish@redhat.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-08-29Enable retrying content assist in FetchGerritChangePageChristian Halstrick1-1/+1
In the wizard "Fetch from Gerrit" you couldn't retry content-assist in case of a transport exception. Change-Id: I58b9d92fdefbc331a568fd562061a145233c205c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-08-29Remove unexpected border from Git Compare Tree Compare viewDani Megert1-2/+2
Change-Id: Ib6d1d4e0991418b5a5ac91a56c3b1648ef382791 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
2012-08-28Add 'Create Patch...' to context menu of 'Synchronize' viewDani Megert2-1/+9
Bug: 379380 Change-Id: I3d15c036f265f2ad23f2a76923d9587028318b6b Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-08-28Show problem decorations in staging view and commit dialogRobin Stocker6-15/+270
This makes errors/warnings on the files visible while committing. Before, these could only be noticed in other places before committing (e.g. the package explorer). In an earlier version of this change, IDecoratorManager was used. The problem with that was that it could be turned off in the preferences and that updating behavior was not correct. So in this version, a plain ILabelDecorator is used and the decorations are updated using a IResourceChangeListener. Bug: 382755 Change-Id: I142a5f20b35f98675b90170dc1328ea637468c06 Signed-off-by: Robin Stocker <robin@nibor.org>
2012-08-28Add command to enable running garbage collectorMatthias Sohn6-0/+223
The command is exposed in the context menu of repository nodes in the Repositories View. If multiple repositories are selected they are gc'ed one after the other. JGit change I8dcdf0b83e91e6132dc490e8ec53818220773c94 isn't strictly required for this change but fixes how the gc progress is displayed in Eclipse. Change-Id: Id5ef0b96a791187559efcdd032a0b929057cf851 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-08-27Update maven plugin versionsMatthias Sohn1-4/+4
Change-Id: I62b782641078dc580c5326d95617082bee678a59 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

Back to the top