Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-02-20EGit 0.11.3v0.11.3stable-0.11Matthias Sohn22-126/+126
Change-Id: I4eddda7313c9344bd49a28c15040072c9996ea09 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-20Fixed a problem when committing mode changesChristian Halstrick1-0/+8
When HEAD and index contained a regular file (a file with the executable bit not set) and in the working tree the associated file was modified to be an executable file then EGit had a bug while committing this mode change. In EGits commit operation the index was updated and the tree for the commit got prepared. The index was updated correctly but the tree to be commited always contained a regular file. After the Commit operation we had different entries for this file in index and HEAD. This commit fixes this by explicitly checking for executable-bit in the associated index-entry and setting the new TreeEntry accordingly. Bug: 307560 Change-Id: Id7f4a87326d32a7c4cdaa199005ee452178f2e7a Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-20Fix failing GitRepositoriesViewTestJens Baumgart1-1/+8
GitRepositoriesViewTest failed due to a focus handling problem. Change-Id: Ifb75c3942d38573682b8eac26fa1701f9aaa49d2 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-20Fix missing Team->Remote sub menuJens Baumgart1-3/+3
Team->Remote sub menu was missing in Package Explorer. Change-Id: I574dd6013141853a46da97a4c3024dc0fe42b816 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-20Fix NPE in Repositories ViewJens Baumgart1-2/+3
Bug: 337304 Change-Id: I54f8ef478c3a7f111c37a2f905c8a83a35702579 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-20Set focus to "Change" field in "Fetch from Gerrit" wizardMatthias Sohn1-1/+1
The "Change" field is the one typically edited when using the "Fetch from Gerrit" wizard. Setting focus to that field helps to avoid unnecessary clicks in the most common use case. Change-Id: I33a40099d2205124677afb7d93c9c9b86760d533 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-20Hide "Team > Remote" sub-menu if project is not shared with GitMathias Kinzler2-3/+50
Bug: 336716 Change-Id: I6d4b1b6bca125629c189870e42a6a3e522e50d48 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-20[sync] Fix showing compare editor in workspace modelDariusz Luksza2-1/+76
This change also adds tests for launching compare editors from Git Change Set and Workspace models. Bug: 337198 Change-Id: I396155fe48faffbab60c430b5300e614bdffdbcd Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-11Qualify post 0.11.1 buildsMatthias Sohn22-126/+126
Change-Id: Ied2f3e54740ec11c77219db3f83cf26d033173c5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-11EGit 0.11.1v0.11.1Matthias Sohn22-126/+126
Change-Id: Icad36cf005cf517ce852ad83e85e40e900fd6039 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-11Fix version.shMatthias Sohn2-8/+45
Also change sorting in org.eclipse.egit.ui.test/pom.xml to ease finding versions to be changed by version.sh. Change-Id: Ic7518ab2eb65d43c3bdba8f957e82e6700beb95f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-11Update documentation for 0.11Matthias Sohn101-1401/+1045
Change-Id: I150b49f19b7862d074b1a378baf7d639b7b29b66 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-11Merge "Push: handle default Push RefSpec correctly" into stable-0.11Matthias Sohn1-5/+62
2011-02-11Push: handle default Push RefSpec correctlyMathias Kinzler1-5/+62
When there are no explicit Push RefSpecs for a remote, push to this remote should update all branches by default Bug: 336884 Change-Id: I30d92cd0740f1c07b3dc93ae0d2e2314f06b4d8d Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-11Merge "Do not use control if it has been disposed already" into stable-0.11Jens Baumgart1-0/+2
2011-02-11Simple Configure Push/Fetch: hide "Configure" buttonMathias Kinzler2-0/+2
The result dialogs shown when "Dry-running" fetch and push from the "Configure Push to upstream" and "Configure Fetch from upstream" dialogs, respectively, should not show the "Configure..." button, as they have already been started from that dialog. Change-Id: I802af24767925a0cfd41aedb7b4394c2b948853b Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2011-02-10Do not use control if it has been disposed alreadyMatthias Sohn1-0/+2
Bug: 334235 Change-Id: I09232918cddf7fb19d45f5c58620158c7701e013 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-10Better Exception handling in Fetch and Push OperationsMathias Kinzler2-4/+12
Currently, a NPE is logged when fetch or push fails since the operation returns null as result in this case. Bug: 336646 (not full resolution, but mentioned there) Change-Id: If29240874f2ce246f597ee6fdb9ba4d2accb772e Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2011-02-10[repoView] avoid repeated logging of Exception during startupMathias Kinzler3-3/+13
The RepositoriesView looks up the RepositoryCache with all the directories it "knows". When an Exception occurs, it is logged, but the corrupt Repository is not removed from the view. When the view is refreshed or re-initialized, the Exception is logged again. The Exception described in the bug occurs if the config file does not contain an entry core.repositoryformatversion = 0 which is checked in the constructor of FileRepository. The check was introduced to ensure interoperability with the command line Git. With this fix, the Exception is only logged once and the offending Repository is removed from the Repositories View. Bug: 318875 Change-Id: I234c94f4f1a053b441e86f9e1aeaf55cf3ca4587 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-09Close 'Configure Push to upstream' wizard on 'Save'Matthias Sohn1-3/+5
Close the wizard when 'Save' is clicked to improve usability. Bug: 336712 Change-Id: Ie73d594c69100e02f2f699b8e030be4580bcdce6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-09Merge "Cache DirCache instance in DecoratableResourceHelper" into stable-0.11Chris Aniszczyk2-2/+19
2011-02-09Merge "Enable Team menu in editors" into stable-0.11Chris Aniszczyk1-15/+0
2011-02-09Merge "Avoid ClassCastException in Repositories View" into stable-0.11Chris Aniszczyk1-4/+5
2011-02-09Merge "[sync] Fix deleted files in sync-view" into stable-0.11Chris Aniszczyk3-1/+77
2011-02-09Cache DirCache instance in DecoratableResourceHelperJens Baumgart2-2/+19
DirCache instances are reused in DecoratableResourceAdapter and DecoratableResourceHelper to improve decoration performance. Depends on jgit change http://egit.eclipse.org/r/2467 Change-Id: I222c5880167c99dee1c3a5c018fb329688720472 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Philipp Thun <philipp.thun@sap.com>
2011-02-09Enable Team menu in editorsMathias Kinzler1-15/+0
This removes the "visibleWhen" restriction of EGit's overwritten Team context menu. This is in line with the definition of the "original" Team context menu in org.eclipse.team.ui. Bug: 336308 Change-Id: I00d3cdd299fb8256e0bc6235766a8b4ce8943e1e Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2011-02-09Avoid ClassCastException in Repositories ViewMathias Kinzler1-4/+5
These Exceptions are logged in the error log and prevent the view from being updated correctly. Change-Id: Ia983edfc426b0216f8a5d89961c9828ac95e0f5b Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2011-02-08[sync] Fix deleted files in sync-viewDariusz Luksza3-1/+77
Deleted files were not shown in synchronize view because we check object type only in actual tree. Now if object type in actual tree is OBJ_BAD we try to get its type from base and ancestor tree. Bug:336652 Change-Id: Ib3e9fe18b2531dc84cb55788a76f66a131e544c1 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-08[sync] Fix newly created files in 'working tree' nodeDariusz Luksza2-19/+2
Newly created files were not included in 'working tree' node because the DirCacheIterator was not found in TreeWalk instance. It also appears that we don't need to have instance of DirCacheIterator to get list of children in GitModelWorkingTree and GitModelCache. Bug: 336663 Change-Id: Ide3c9096e7c3a0c7cf80519dc023bbe03a8cd56e Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-08[sync] Don't show empty staged and working tree nodesDariusz Luksza1-2/+8
Staged and working tree nodes were shown even when there were no changes inside. With this change such situation shouldn't occur anymore. Change-Id: I26010a1df1abbcb051d2916761aac53718d12624 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-08Fix a couple of misleading wizard texts (Import projects page)Mathias Kinzler1-2/+2
Change-Id: If58277d39a7dc6a1fcd4a917a0b83629dce51215 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2011-02-08Get rid of "Redundant Null Check" compiler warningMathias Kinzler1-2/+1
Change-Id: Icdebc1529c6c99c88c2c5b7ba4c936cc004288a4 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2011-02-07Add a "Fetch Change from Gerrit" actionMathias Kinzler9-0/+887
The action is available from the Repository view (on Repository nodes) as well as via Team > Remote > Fetch a change from Gerrit. The user needs to select a URI (the dropdown is populated from all URIs available from all remotes of the current Repository) and a change. There is a content assist for the change. By clicking CTRL+Space, the user can see a list of changes and select one. The user can also paste the change in the form refs/changes/<nn>/<nnnn>/<nn> from the Gerrit WebUI or type it in manually if they know the specifics... There are several options available to perform after fetch was done: creation of a local branch (default), creation of a tag, checking out FETCH_HEAD, or doing nothing else (just updating FETCH_HEAD). If a branch or tag is to be created, a name is suggested in some pseudo-hierarchical format ("change/<nnnn>/<nn>" which comes in handy when the user activates the "hierarchical branch layout" in the Repositories view)... Change-Id: Ie639e3662cc3994331e26c8c94e11458ad9dd8fa Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-07Add icon to represent GerritChris Aniszczyk2-0/+5
When we generate Change-Id's for Gerrit, it would be nice to have an icon to represent Gerrit instead of text. Change-Id: I1c5ec7945290ecab2427bc53f32f61685832ca05 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-07Fixed broken GitImportWizardChristian Halstrick1-5/+5
The GitImportWizard was throwing ArrayIndexOutOfBoundsException when trying to import as "General Project". Change-Id: Id0d56888c8541738155f3c375f2a919a50cd37e4 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-06Avoid ClassCastException in DecoratableResourceAdapterMatthias Sohn1-5/+11
Bug: 297163 Bug: 336381 Change-Id: I609bf55b1928fed56f2073e459d2145c6f64ca0f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-06Fix IncorrectObjectTypeException in CommitMessageViewerMatthias Sohn1-4/+9
Tags can point to any object, the commit message viewer only wants those referring to commits. Bug: 336380 Change-Id: I329b0a0254a3b5585798f187de60758615011ead Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-05Fix JobFamily of PushOperationUIMatthias Sohn1-1/+1
Change-Id: Icc9c2e5fa17085a749e58065e1c5d6eeb7b1f2b9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-05Fix simple fetch and push on repository nodeMatthias Sohn2-22/+57
Simple fetch and push failed with a ClassCastException if called from repository node in the Repository View. Also show message dialog if no configuration could be found. Change-Id: Ia16b077d629fdc3f44c41d693327a357be0d28f1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-05Fix wrong command IDs for ConfigureUpstreamPush/FetchMathias Kinzler1-13/+3
This results in the corresponding menu items being disabled. Also added Git command category. A couple of commands were duplicated which resulted in some warnings in the error log (command handler conflicts). Change-Id: Ieefc4023036cd11c7fcbf4cb867b2ba51c59b76c Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-04Create Branch: wrong initialization of "upstream config"Mathias Kinzler2-26/+14
This results in the wrong configuration if the user does not click on any of the "Pull Strategy" buttons. Change-Id: Ib5e7768a627088137c1cb0621bf380dcd9152c83 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-04Fix missing decoration for conflicting filesPhilipp Thun1-2/+4
Change I0d63413c644b4dcfe9aaa6052e397673feaae6fb (Queue decoration requests) introduced a problem related to conflicting files - they were not decorated properly, but exceptions were written to the Eclipse log. Change-Id: I71713ec3389ac6acea23ad1a46957d8be930f53c Signed-off-by: Philipp Thun <philipp.thun@sap.com>
2011-02-03Fix create and rename branch ui testsMatthias Sohn1-10/+13
The branch dialogs were improved but the corresponding tests were not adapted appropriately. Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I7f92be2c0ab44d001946ec75334d881820109a5d
2011-02-03[sync] Show separate node for tags in sync-dialogDariusz Luksza4-17/+35
Show all tags in separate node "tags" in synchronize dialog. Also improve labels in this dialog. Change-Id: I9705d79b9d5703993cbf4db121373805530e0097 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-03Branches and Tags links in commit message viewerilya_ivanov4-8/+223
Some analog of 'gitk' utility links. Added following info to commit message viewer: Branches - links to branch refs Tags - list of tags pointing to this commit Follows - link to previous tag in history Precedes - link to next tag in history Bug: 336223 Change-Id: I1c61d2c7eca14ba534302eec6e38bdbe85e0107f Signed-off-by: ilya.ivanov <ilya.ivanov@intland.com> Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2011-02-03Add "quick" compare and use it in history view by defaultMathias Kinzler9-26/+615
When clicking "Compare with each other" after selecting exactly two commits while showing a project, folder, or repository in the history view, we open a "quick" compare (using the Eclipse compare infrastructure) to show the structural differences instead of the Git Tree Compare view. A new menu action is added to allow to open the Tree Compare. Change-Id: I411e290131647c969b96df71eb9c7c0f899b7c6b Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2011-02-03Queue decoration requestsPhilipp Thun8-163/+543
In order to avoid the creation of an individual TreeWalk for each resource, decoration requests are queued and then processed by a separate job using a single TreeWalk with n path filters (n = number of files). Project nodes and folders are processed as before. Bug: 325393 Change-Id: I0d63413c644b4dcfe9aaa6052e397673feaae6fb Signed-off-by: Philipp Thun <philipp.thun@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2011-02-03Merge "Simplify Fetch and Push fourth part: update action set"Chris Aniszczyk2-10/+32
2011-02-03Merge "Simplify Fetch and Push third part: menu shortcuts"Chris Aniszczyk2-32/+63
2011-02-03Merge "Simplify Fetch and Push second part: Add a simplified Push wizard"Chris Aniszczyk35-303/+3595

Back to the top