Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-05-08EGit v3.0.0.201305080800-m7v3.0.0.201305080800-m7Matthias Sohn2-2/+2
Change-Id: I00acc9a793a022f4c15457e3ee5e40d971a6c118 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 Sohn2-400/+400
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 Rey3-19/+49
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-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-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-28Adapt to publicized Reflog API in JGit cont'dRobin Rosenberg1-3/+3
Change-Id: I99d6ca6cfc9b3a77101807cd135f7e753a4dfa50
2013-04-27Adapt to publicized Reflog API in JGitRobin Rosenberg3-8/+6
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 Rosenberg4-19/+11
In particular we do want to find a path relative to a closed project. Change-Id: If6e94a381bcea86c73e361ae7669309f5f00df83
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-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-24Remove unnecessary usage of the internal FileRepository classRobin Rosenberg4-11/+14
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-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-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-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-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-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-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 Stocker3-1/+20
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
2013-04-13Use the source revision instead of local data for synchronizationsLaurent Goubet3-63/+52
EGit allows for comparisons with three remote revisions (notably through "synchronize with each other" with two branches selected in the repository explorer). However, Team always uses the local data as the "source" (or left) side of a comparison. This patch allows us to use the actual source commit instead of the local file when needed. This also changes GitModelSynchronizeParticipant#asCompareInput() since we can use the cached content fetched by the subscriber context instead of re-fetching it from the remote. CQ: 7175 Bug: 403363 Change-Id: I23e0f1e75b9c6d476f8ed5a24deac7cc7b64dd42 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-03-25Improve error reporting for pull failures due to conflictsRobin Rosenberg4-38/+55
Change-Id: I9d64db17f2924ac2726aeedc83e55e9fdf653e15 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-03-24Ensure repositories are also closed if an exception is thrownMatthias Sohn2-7/+18
Improves change I3a596fcabdb5225e9042e1ffae6b054c48d72d54. Change-Id: I8011398e5cb19f8e24ef2bd2d74512a0fbc12c64 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> cc: Robin Rosenberg <robin.rosenberg@dewire.com>
2013-03-24Fetch from Gerrit should allow to be run in backgroundTomasz Zarna3-46/+116
Bug: 402633 Change-Id: Ic01a8ccb7569ae1d5f473eeb3034ce46e060c536 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-03-23Import should use a version rangeRobin Rosenberg1-1/+1
Change-Id: I2836271e9940640cc13dca4cc2d1be4279bc5fd0
2013-03-23Merge changes I28fdf160,Idf0333c3Robin Rosenberg1-11/+0
* changes: Remove no longer used API filters Remove use of internal JGit class FileRepository
2013-03-22Eliminate file handle leaksLaurent Goubet2-4/+25
Running the SWTBot test suite on a Windows environment highlights insidious file handle leaks caused by JGit's WindowCache which keeps ".pack" files open for reading and thus locked for deletion until the repository is properly closed, but EGit might not keep a reference towards this repository in its cache, "forgetting" to close it when needed. This is mostly true for sub-modules. This patch also gets rid of other random errors, sometimes due to a .project not properly removed. Bug: 404121 Change-Id: I3a596fcabdb5225e9042e1ffae6b054c48d72d54 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-03-22Remove no longer used API filtersMatthias Sohn1-11/+0
Change-Id: I28fdf160651a8788f67c3decbd8e1e21dc63bf36 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-03-21[historyView] Adjust column weights/widthsRobin Stocker1-6/+6
* The author columns don't need to be wider than the committer ones. * The Id column can be as small as its minimum width. * The message column should be the widest one by far, certainly wider than author. Change-Id: I05c170de28dfc1fb3fff0668ec56a1bf61e81865 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-03-21[historyView] Don't show e-mail addresses in table by defaultRobin Stocker1-1/+2
The information is not that important to be shown directly in the table. When it is needed, it's one click away in the Revision Details. Removing the e-mail addresses gives some more space to other columns like the column containing the graph, refs and message. Change-Id: I60ba4f8ba9923ccc792013be7c8798b3b8e9fd47 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-03-21Move 'Untrack' to Advanced MenuTomasz Zarna2-6/+43
Bug: 345777 Change-Id: Icc5951f1b8967368e04a07fcbec47abdf798059e
2013-03-20[repoView] Enable rebase menu to abort/skip non-interactive rebaseMatthias Sohn2-3/+13
In the Repositories View the rebase menu was hidden when non-interactive rebase using native git stopped due to a conflict. Bug: 336820 Change-Id: Ibe204eb9547a99a7ced124475452703130768c9b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Robin Stocker <robin@nibor.org>
2013-03-19Bump EGit version to 3.0.0 and require JGit 3.0.0Robin Rosenberg10-93/+94
JGit changed version, change EGit too since it's soo heavily dependet on JGit. Change-Id: I4927823ff3cd499246b5b85534116cb70015cb9d
2013-03-17Remove away-commented code in RebaseResultDialogRobin Rosenberg1-109/+0
Change-Id: I3b533f3efe95c5274fb36fe4f456631642ac980b
2013-03-12Report dirty worktree failure during rebaseRobin Rosenberg1-3/+173
The user really needs this information. Bug: 375825 Change-Id: I93e294d45b2356723b3f1b74c718722deee8f3ac
2013-03-09Fix rebase pulldown in toolbar not being accessible during rebaseRobin Stocker3-18/+46
During rebase, the rebase pulldown menu in the toolbar was always disabled, resulting in no way to do a "abort" or other actions through the toolbar. The problem is that the enabled state of the action handler for the main action also determines whether the pulldown menu can be opened (the little arrow besides the icon). So instead of disabling it when rebase is not possible, also enable it during rebase, and check state again when executing. In addition to the above, this fixes RebaseActionHandler's enabled state to behave the same way as RebaseCurrentRefCommand, in that it's also enabled with a detached HEAD. Bug: 387184 JGit-Dependency: I9ec8568fa1100d2e9c8d4ca0e347bf77ec6d8734 Change-Id: Ic69f5c952a49f023c0949f04b3e976be1b267fbe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-03-09Add instanceof check to fix unchecked conversion warningRobin Stocker1-7/+10
Actually check the elements of the selection to make sure that the cast is right. Change-Id: I2ced1ec0ba982eaf6c7be3adf5f06e294e4588d3

Back to the top