Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-05-08EGit v3.0.0.201305080800-m7v3.0.0.201305080800-m7Matthias Sohn30-31/+31
Change-Id: I00acc9a793a022f4c15457e3ee5e40d971a6c118 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-05-08Add optional org.eclipse.jgit.java7 feature to p2 repositoryMatthias Sohn1-2/+5
Change-Id: Iede92832eb216946b3ee14b7e0d7729894a9c504 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-05-07Update EGit for FollowFilter API changeRobin Rosenberg3-5/+13
JGit-Change-Id: Idb273d5a92849b42935ac14eed73b796b80aad50 Change-Id: I643508cb18d9b76f5746f2f75e47da60e55f750b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-05-06Merge "document empty block in LocalNonWorkspaceTypedElement"Tomasz Zarna1-0/+1
2013-05-06document empty block in LocalNonWorkspaceTypedElementTomasz Zarna1-0/+1
Change-Id: I56be6dd389c3ffd5a8f35ba9f39abb273a260056
2013-05-03Fix line endingsMatthias Sohn10-945/+944
Change-Id: Id7f665b3f4cd7aa48c31593f8b7ce74ee417d5c3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Robin Stocker <robin@nibor.org>
2013-05-03Check target of linked resources in action handler isEnabledFran├žois Rey5-19/+189
The fix provides stronger checks on selected linked resources before enabling menu items. In particular, linked resources that point to a file that is part of a project shared with egit are allowed to be operated on. Otherwise team actions are disabled if the selection contains a linked resource pointing to a file outside any project and repository. A default isEnabled() implementation is provided for this behavior. After adding a test case a couple more handlers have been amended and made compliant. Bug: 406922 Change-Id: Id9fd5ea0c31a78b84796638570d214d14cc3c4fd Signed-off-by: Fran├žois Rey <eclipse.org@francois.rey.name> Signed-off-by: Robin Stocker <robin@nibor.org>
2013-05-01Merge "Ensure that core tests delete resources created during test"Matthias Sohn2-1/+4
2013-04-30[repoView] Show correct icons for add/create new repositoryStephen Elsemore1-2/+2
Use the correct icons for the add/create repository links that are shown in an empty Git Repositories view. Bug: 406910 Change-Id: Ic82fda5da5bfed793010a560e6cb245b46e66881 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-29Show the right tag for unannotated tags after checkoutRobin Rosenberg1-1/+5
Bug: 385392 Change-Id: I26b7129e7ef73d36a76ebc1323c46739c9032bca
2013-04-28Fix IAE in DiffViewer.refreshStyleRanges for binary changeRobin Stocker1-0/+5
The problem was that the underlying document did not yet contain the text that the style ranges were referring to. In DiffEditorPage#formatDiff, the job calls DiffStyleRangeFormatter#write, which flushes the output stream at the end. So implement flush in DocumentOutputStream to make sure the document is complete. Bug: 406542 Change-Id: I2288c8b12a20557f42a51ea11df6dfc6d3b3d91c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-28Ensure that core tests delete resources created during testMatthias Sohn2-1/+4
Some tests didn't delete folders created during test. These garbage folders clashed with folders the failing test tried to create with a different case. This failed when running the egit core tests from Maven on case insensitive file systems. Bug: 406739 Change-Id: I41504bc5ae0bc279fab56c50b3c6606966d46a26 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-28Adapt to publicized Reflog API in JGit cont'dRobin Rosenberg1-3/+3
Change-Id: I99d6ca6cfc9b3a77101807cd135f7e753a4dfa50
2013-04-27Adapt to publicized Reflog API in JGitRobin Rosenberg4-11/+9
JGit-Change-Id: I8ced7098da5b345fd9af2fdfafd1ef6a44ccee0d Change-Id: I214704c3c5f6b9408b343ad0d6091fcf652337ad
2013-04-27Polish "Move 'Untrack' to Advanced Menu"Dani Megert3-40/+9
Bug: 345777 Change-Id: Ic8cb5fc015b4e0080719f406e599bd09da642e07 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Robin Stocker <robin@nibor.org>
2013-04-25Try to find the most nested resource path instead of any with merge toolRobin Rosenberg5-29/+14
In particular we do want to find a path relative to a closed project. Change-Id: If6e94a381bcea86c73e361ae7669309f5f00df83
2013-04-25Merge "Change package of IndexDiffCacheTest"Robin Rosenberg1-1/+1
2013-04-25Fix order of projects as returned by ResourceMappingRobin Stocker2-6/+31
When executing a pull on a working set, WorkingSetResourceMapping returns the projects in unpredictable order. This makes the listed repositories in the result dialog look messy. So sort the projects by name so that it corresponds to the navigator sort order. Change-Id: Ibd4500d7fb18fb773aadb1fe08d1a7bf83f29176
2013-04-25Change package of IndexDiffCacheTestRobin Stocker1-1/+1
It now corresponds to the package of IndexDiffCache. Before, the package name included an uppercase letter, which is discouraged. Change-Id: I55b713399107b16ed967e72f29c60c6f8274918f
2013-04-25Use correct icons for "Show files with equal content" featureDani Megert3-4/+12
Bug: 345513 Change-Id: I39d5c8d4355131dfee62d032d17c2c4c58b76d2e Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Robin Stocker <robin@nibor.org>
2013-04-24Avoid internal use of WindowCache.reconfigureRobin Rosenberg1-2/+1
Change-Id: I487959f40d7d03ad8f9b6f8b547208ca8604ecd4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-24Remove unnecessary usage of the internal FileRepository classRobin Rosenberg31-86/+93
Change-Id: Iae7b4e550d75798dc66edf6c9e03ea826f072f33 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-24"Rebase > Skip" should be named "Skip commit", add mnemonic for "Abort"Tomasz Zarna2-4/+4
bug: 403240 Change-Id: Ia06a40b0db36d632c2d673a903056c39d5ff5e57 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-23History View: Allow checkout of remote tracking branchTomasz Zarna2-5/+11
Couldn't checkout remote tracking branch if it points to same commit as the currently checked out branch. Bug: 385002 Change-Id: If07412a40cb28303af96c559fa1951efb81ec322 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-23Branch Creation: default for pull strategy is inconsistentTomasz Zarna1-3/+31
Bug: 384605 Change-Id: I273f8f520ea4daa8d1682de125cbb442c126cf87 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-23Improve misleading message in progress view when rebasingTomasz Zarna3-10/+18
Bug: 399924 Change-Id: I0bf18bcca269acad0437c5a1e89935904c93d43d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-21Be more strict when identifying a .git directory as a repoCarsten Pfeiffer1-2/+9
Don't assume that any .git directory with a file named 'config' in it is a git directory. Change-Id: Id7a2c26c6e3e5ed3dd192c68cc953fe8d89d27b7 Signed-off-by: Robin Stocker <robin@nibor.org>
2013-04-19Don't access disposed widget in StashCreateUI.showNoChangesToStash()Robin Stocker3-12/+15
The method is called from the job and the original shell may not be there anymore in case of showing this from the branch checkout dialog. Bug: 389866 Change-Id: Idf7480a823fa84b684c00648a664ad3dac15cd70
2013-04-19Fix StashCreateOperationTest by adjusting test setupRobin Stocker1-3/+10
It was broken by the behavior change in JGit I71727addb2b55fb8e409cae2b6af8138b1ff7ef1 to not include untracked files. Change-Id: I6276bb8ddc84cc674e7eeba031cfc0feb09c1845
2013-04-19Merge "Update only working tree message when creating a stash"Robin Rosenberg1-3/+1
2013-04-19Sort files in PullResult dialogRobin Rosenberg1-1/+8
Bug: 405894 Change-Id: I8a32aa953eefdc2d9b237790b8b742d192a2e6bc Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
2013-04-18Local files should remain editable when synchronizing.Laurent Goubet1-4/+6
We can't wrap WorkspaceFileRevisions within FileRevisionTypedElements since those are not editable. Bug: 403363 Change-Id: I2a18495e349b64128166a39533fda8b02109d4dd
2013-04-18NPE when synchronizing with resources out of the workspaceLaurent Goubet1-1/+1
Bug: 405772 Change-Id: I0b6fede76e74753f4bb19c2308ac6e6df0618077
2013-04-17pull up #getBranchesOfCommit and #getRepository Tomasz Zarna3-69/+45
These two methods can be pulled up to AbstractHistoryCommandHandler Change-Id: I6ef71d0e800142d6b762e7b5b8814e7b716a37be Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-17Merge "Text decorator: Use two spaces to separate it"Matthias Sohn1-1/+1
2013-04-17Text decorator: Use two spaces to separate itTomasz Zarna1-1/+1
The project text decorator should use two by default, for better readability and to be aligned with CVS. Bug: 359681 Change-Id: I2d538cbd93bf44012ef1fc300ed36322024e442b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-17Merge "@since in coretext is not worth it"Matthias Sohn1-9/+3
2013-04-17Merge "Move CoreText to internal package"Robin Rosenberg51-46/+49
2013-04-17@since in coretext is not worth itRobin Rosenberg1-9/+3
Change-Id: Ifbf69470198b424944d983cbe8890ff6b0d900d1
2013-04-17Move CoreText to internal packageRobin Stocker51-46/+49
See I8439adce61515177d36227c844d6284de700964f where this was already done for UIText. CoreText is also not API. Change-Id: Ia15ce778a57f5b28bd7ac976d46658b4f402a718
2013-04-17"Remove repositories job" label should not contain "job"Tomasz Zarna3-1/+5
Bug: 402624 Change-Id: Iaed77831231f5be89949a0655f7823d7d5370d57 Signed-off-by: Robin Stocker <robin@nibor.org>
2013-04-16Add missing @since 3.0 tagsDani Megert3-6/+17
Change-Id: Iad4dcb0ed26c60a947d8ba65b7afe26efd00b481 Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
2013-04-15Move uitext.properties to internal packageRobin Stocker2-1/+1
I8439adce61515177d36227c844d6284de700964f moved the UIText class to the internal package. As it's customary to have the .properties in the same package, also move it there. Change-Id: I62f77d64c72a4794e61303a60de9fc5b1fdff74a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-15[stagingView] Improve usability of "Replace with" on missingRobin Stocker3-4/+16
Only provide one of the equivalent options for a file that has been deleted. For this to work, we now distinguish between missing MISSING and MISSING_AND_CHANGED (which has changes in the index). For the latter we still have to provide both options. See also I65601162f7ef506ea270933218601322fde1e929 where the same change was done for modified files. Change-Id: Id4ff449791e7a911809281bab63f9d3e3d17b5ed Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-15Use ResourceUtil.getFileForLocation in StagingEntry.getFileRobin Stocker2-18/+6
The util method now includes more logic for finding the right one, which should also apply e.g. for Show In actions. Additionally, selectionIncludesNonWorkspaceResources in StagingView now uses StagingEntry.getFile instead of implementing similar but not quite the same logic. This fixes some strange behavior with nested projects. Change-Id: Iff238b7e228044fe027538eefd81700bccef505e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-15Improve label of index version in compare editorsRobin Stocker4-2/+21
When opening the compare editor from the staging view for an unstaged file, the right side shows the Index version. The problem is that not many people discover that it is in fact editable (and the way to do partial staging). This change tries to help a bit by changing the label from file.txt Index () to Index: file.txt (editable) Index is used as a prefix because the left side is "Local: file.txt". "(editable)" is not appended in case of non-editable (stage != 0), see bug 391856. Bug: 398562 Change-Id: I9940d2f148393b1f4704664e379c5c863565a118 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-15[findbugs] Fix potential NPE in FileDiffRobin Rosenberg1-0/+2
Not likely, but try to handle gracefully if it does happen Change-Id: If2533df563171ba216f732a40a8ff912617bf8da Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-15Fix potential NPE if .options doesn't existRobin Rosenberg1-6/+21
If .options does not exist, getResources will return null rather than causing an IOException in openStream. Change-Id: I082d102d5b219be710ec2299e2e552ae0fe8478a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-04-15NPE when right-clicking the synchronize view with no selection.Laurent Goubet1-1/+4
Change-Id: Ie883783016b66cf2c6ebe5110d5f35cc0f7d2e39 Signed-off-by: Robin Stocker <robin@nibor.org>
2013-04-14Rename Rebase>Skip menu to Rebase->Skip commit and continueRobin Rosenberg1-2/+2
Bug: 403240 Change-Id: I30f6ec704ee39f392bfcd2626d82b3bffce2b60c

Back to the top