Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-02-15Prepare post 1.3.0.201202151440-r buildsMatthias Sohn26-32/+32
Change-Id: Ie67e04a8840b1eecd857473a03449d8779a5af8f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-15EGit 1.3.0.201202151440-rv1.3.0.201202151440-rMatthias Sohn26-33/+33
Change-Id: I6dce9bbbbe165d800a8b52fb37aeffec0563dced Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-15Use mylyn 3.6 p2 repositoryMatthias Sohn1-1/+1
Earlier we had to use the mylyn weekly build to use wikitext. This is no longer necessary as it's available in 3.6 now. Change-Id: I846ff03e5974f3245748bd0858bb8dd7f3db51df Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-15Update documentation for 1.3Matthias Sohn30-416/+537
Change-Id: I5c98b8f8889fb09ae83bd856529c13e2b307e860 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-15[syncView] Disable instable ui testMatthias Sohn1-0/+2
This test is failing frequently with diverse error messages. Hence disabling it until we found the reason and fixed it. Filed bug 371633 to track this. Change-Id: I465bc2ab06d1da057acd8322abbd45d89b0bef0b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-13Prepare post 1.3.0.201202121842-rc4 buildsMatthias Sohn26-27/+27
Change-Id: Ib0d9c3e199f3629eb457aa53117569c7334574d4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-12EGit 1.3.0.201202121842-rc4v1.3.0.201202121842-rc4Matthias Sohn26-27/+27
Change-Id: I8240f7ad2458be7c626acd5fdeeb10a9ed3457e0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-12Add Maven profile for Indigo staging repositoryMatthias Sohn1-1/+15
Change-Id: Ie6f163b38affceb0534bcb5260a0a03b58cf3e01 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-12Fix target platform for running mylyn ui testsMatthias Sohn1-3/+3
Change-Id: I7fcfc6990b9a1dbbae631bf185e593ec37a9ed47 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-11[historyView] Disable file actions when submodule is selectedKevin Sawicki2-11/+28
Change-Id: Ia0e9c3e6ad6c19ca2b569bd64cb6775d575170e1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-11[stagingView] Disable open action when submodule is selectedKevin Sawicki1-6/+17
Change-Id: I1afb08c26696238bfe54ae744d4dac7337066024 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-10[repoView] Add submodule add/sync/update supportKevin Sawicki21-2/+1381
The Submodules node and all child repository nodes now have an Update and Sync action available from the context menu. Root repositories and 'Submodules' nodes now have an Add action that opens a wizard to configure a new submodule that will be configured in the parent repository and cloned on completion. Change-Id: I2afea7dca9e40a2748c10a7f835b2deae301ba73 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-10Delete working directory when removing a submodule repositoryKevin Sawicki2-0/+61
Change-Id: Ie93d16e627bd091b111b3441c1d5ef0d0de881db Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-09Update build to use the Indigo SR2 orbit repositoryMatthias Sohn1-1/+1
This was requested on the cross list for Indigo SR2 builds [1]. [1] http://dev.eclipse.org/mhonarc/lists/cross-project-issues-dev/msg07166.html Change-Id: I924163a0ba30bdc4d335780997d80a9104f53db2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Kevin Sawicki <kevin@github.com>
2012-02-09[repoView] Test repository deletionMatthias Sohn2-0/+75
Change-Id: I263b74a30ea2171d0c9fdb70bf5c83c312231cf1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Kevin Sawicki <kevin@github.com>
2012-02-08Disable buttons when config is missing or not writableKevin Sawicki1-10/+20
The ability to add, edit, and remove sections is now disabled when the configuration being viewed is either not writable or missing. Bug: 370228 Change-Id: I61fe1b0f751badf443f6f63463d9924004a62e6b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-04Fix test SynchronizeViewGitChangeSetModelTestMatthias Sohn1-2/+3
Some tests didn't expect a dirty marker in text decoration. Change-Id: I58b9131812a9696ad41e59e39a173a7161924a01 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-02Support tracking project at root of repositoryKevin Sawicki1-1/+10
Previously a project at the root of the working directory was not tracked since they didn't have a relative path and were not stored correctly in the memento. This case is now explicitly handled and a project at the root of the repository's working directory will now be tracked and re-opened when switching branches. Change-Id: I6ad4620b866fc2bce0ee02e47782bc5a2271aa52 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-02Create ProjectRecord from .project file instead of parentKevin Sawicki2-4/+8
The project root folder was previously passed to the ProjectRecord constructor incorrectly causing issues when tracking projects where the root folder differs from the name in the .project file. Now the '.project' file is passed to the ProjectRecord constructor when restoring projects on a checked out branch. Change-Id: I60c3d04d5c580929ce14974ecfe503da1bf912f6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-02Add proper check to ensure created folder is cleaned upKevin Sawicki1-1/+1
Previously missing '!' before hasRoot to ensure folder is only deleted if it didn't previously exist and was created to stage a project that is being closed due to it missing on the current branch Change-Id: I590c0768bb17df21cc45412527a843ce5f234be1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-01Guard against missing HEAD object id when decorating submodulesKevin Sawicki1-2/+2
This can occur when the label provider is run for a submodule repository while the submodule repository is being cloned Change-Id: Id56f79dd342f0483f1d2263715762e35db5470ad Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-01[historyView] Add context menu to compare with working directoryKevin Sawicki3-0/+62
This action can be used to bring back hunks from previous revisions or to pull changes from an opened stashed commit. This action will also be available in the Files section of the commit editor. Change-Id: I0e2404b9af9c434467656f7243ed11fd69871430 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-01Merge "[repoView] Show stashed commits" into stable-1.3Matthias Sohn12-7/+185
2012-01-31Prevent StackOverflowException in RepositoryMappingDariusz Luksza1-0/+2
StackOverflowException occurs when one of workspace projects is remote project (eg. created using Eclipse Linux Tools) Change-Id: I69b9d659ea44192082ed1ba3b829c264cb1185a7 Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2012-01-31[repoView] Show stashed commitsKevin Sawicki12-7/+185
Adds a new root level node that displays a list of the stashed commits that open in the commit editor when selected. Future actions will be added to stash current work, apply a selected commit, and drop a selected commit. Change-Id: I6b7e5670a89c553acd95528fbb5906e75f1d4656
2012-01-30Merge branch 'master' into stable-1.3Matthias Sohn2-15/+43
* master: HistoryView: allow to select Ref when creating a Branch Change-Id: If342443ed7feb7c0480f8f094796f841e7ea1e13 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-30HistoryView: allow to select Ref when creating a BranchMathias Kinzler2-15/+43
If the user selects a commit with a local or remote branch on it, the user should be able to select one of these branches as base for the new branch instead of always creating the new branch on the commit. Change-Id: I6addd9ed5e555db132be2d71152bee87cc07a561 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2012-01-30Improvements and fixes for clone wizardStefan Lay4-15/+103
- Allow repository search result to be passed to AbstractGitCloneWizard and GitCloneWizard. The repository location page is skipped in this case. If the search result provides a WizardPage, then it's shown, otherwise the result is directly evaluated. - As a side effect, this restores URI paste support in repositories view - Skip repository location page if there's only one clone source provider with a fixed location Change-Id: I6e32cb0c5dea5a7689a5a99bc7ba50b2010170e2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-30Support double-click event on repository location pageStefan Lay1-0/+11
Change-Id: I7cf1d936503c91f0d652cf5a1d1a1976e2edf881 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-30Remove Gerrit Configuration Page from Clone WizardStefan Lay3-88/+5
Now we have the possibility to plug in clone sources. The Gerrit configuration will be provided by the appropriate Gerrit extension. If this extension is not installed, or the user has cloned from another source or using a custom URI, he can still configure the remote as Gerrit in the context menu of the Repositories View. Change-Id: Ia7f6654447e699d0b2d785efd852652b0a470d69 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2012-01-30New wizard to configure a remote as GerritStefan Lay9-17/+305
Bug: 357222 Change-Id: If1b2e062501650a7742ce2c857fa78ed55c11bb3 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2012-01-30Redesign GitCloneWizard to include contributed clone sourcesStefan Lay7-98/+108
The GitCloneWizard now includes the extensions of the org.eclipse.egit.ui.cloneSourceProvider. Bug: 361251 Change-Id: Idfd4cc6378eb861188820f50254d425cd8f79553
2012-01-30Improve Exception Handling for Clone Source extension pointStefan Lay8-5/+126
Change-Id: I27420bee1e1c513180a5aeae6d0985d766ef4244 Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-30Add an icon attribute to the cloneSourceProvider extension pointStefan Lay4-24/+90
Change-Id: Ibac3450de851351131fe57e6bb7c78a2fc3d4d49 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2012-01-30Allow for repository configuration using GitRepositoryInfoStefan Lay6-4/+125
An extender of org.eclipse.egit.ui.cloneSourceProvider can specify configuration settings using the class GitRepositoryInfo. This info is used now in the clone step. Change-Id: Ic65f07474083cd98fcc11dc22e8bfc4a284ec9d5 Signed-off-by: Sascha Scholz <sascha.scholz@gmail.com> Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-30Redesign GitImportWizard to include contributed clone sourcesStefan Lay17-90/+483
The GitImportWizard now includes the extensions of the org.eclipse.egit.ui.cloneSourceProvider. The flow of pages is the same as described in the Mock-Up which is attached to Bug 361251. Bug: 361251 Change-Id: I957ee48121b24fd78a91fe5e2855130c4614649f Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-30Refactor GitCloneWizardStefan Lay2-295/+394
Extract reusable code to an abstract super class. Bug: 361251 Change-Id: I94056fc75acde4e29b72dd5284cac97101b64e86 Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-30Add an extension point to provide repository searchStefan Lay15-0/+845
The new extension point can be used to contribute the ability to search for repositories on a remote server. It will be used in a new version of an import wizard. For this use case an implementor can provide a Wizard page implementing such a search. Bug: 361251 Change-Id: I4e3a3ff88dbb5642dd61c55d751f4be12e93f720 Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-28Update .eclipse-iplog for 1.3.0Matthias Sohn1-1/+1
Change-Id: I8c50b30756b11fa777889a4ccb75cb969fc28b65 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-26[repoView] Hide 'Submodules' node when no configuration existsKevin Sawicki2-2/+20
Only show the 'Submodules' node when the repository either contains a '.gitmodules' file or has at least one 'submodule' section in the config file Bug: 367955 Change-Id: I1b8575bed7f018e1d4ee7273c4b83c8044232822 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-26[sync] Add StagedChangeCacheMatthias Sohn4-34/+381
Adds caching mechanism for retrieving staged changes. This class will be used in feature by new Git Change Set implementation. Change-Id: I38da79aeff5e20ceb14a6abcf0b19b068c50333a Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-25[sync] Add WorkingTreeChangeCacheDariusz Luksza3-0/+367
Adds caching mechanism for retrieving working tree changes. This class will be used by the new Git Change Set implementation. Change-Id: I7aa21006a70bc742e5a798651c78159d5f5b1a78 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-25[historyView] Support linking with commit editorKevin Sawicki3-6/+28
Opening the commit editor with the history view in link mode will now set the input of the view to be the commit's repository and the current commit being viewed will be selected once the view loads Bug: 368346 Change-Id: Icccc2d7032ba11b1ead5c993995efaca36251bf0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-25[sync] Add cache provider for Git Change Set modelDariusz Luksza5-0/+1070
Base commit for improving Git Change Set model performance and reducing memory footprint. It simply reduces number of created TreeWalks and instead of keeping full JGit objects it contains only basic data needed by synchronize view. This implementation can change over time. It is possible that during further refactoring of current Git Change Set implementation more data will be needed in cache in such case I'll amend this commit. Requires-JGit: I6fc62c8e6626f907e544b5bbe5d64e864a2c323f Change-Id: If8dfa0251797aca56ddc825619500dc21885ba26 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-25Fix GitCloneWizartTest.invalidPortFreezesDialogDariusz Luksza3-3/+23
Screenshot taken by SWTBot after failing test cases doesn't show clone wizard page. Before we didn't check if it does appear, this change ensures that it is shown. Change-Id: I44a88f51b8ad1d3f7b1f2926c28039af7483966e Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-25Don't set shell as invisible before disposingKevin Sawicki1-10/+10
Just calling Shell.dispose is sufficient and should be done when the graph table is disposed to prevent dangling tooltips Bug: 369647 Change-Id: I07edf7930ca9b88f914f0db8b48e025661b7ca89 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-25Allow to select different diff header formatsTomasz Zarna8-38/+209
See "Pretty Formats" section of git-diff-tree man page for more examples Change-Id: I470ef0181b54d1780fe545cbb8c654247f958c8c
2012-01-25Implement decoration for working setsMarkus Duft3-26/+184
This splits the current decorate() method in two separate ones. One for what was done already (decorate resources), and one for decorating "the rest" (i.e. ResourceMapping's). Bug: 344937 Change-Id: I5a3ae0ce5d429a7065dc16888f206fdbf777b1fd
2012-01-24Merge "Prevent from NPE in GitSubscriberMergeContext"Matthias Sohn1-1/+5
2012-01-24[sync] Add tests for refreshing synchronize resultsDariusz Luksza3-1/+118
Adds tests for refreshing workspace and change set model after repository and workspace change events. Change-Id: I9353f06b5d0215880f4777aa42c62b7f02df7652 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

Back to the top