Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-09-01EGit v1.1.0.201109011030-rc2v1.1.0.201109011030-rc2Matthias Sohn26-34/+34
Change-Id: I529027272c02967e80b060bf664c363b00498921 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-09-01Merge "Show messages in CommitDialog for errors that prevent committing."Jens Baumgart4-2/+76
2011-09-01Merge "Spelling errors in SynchronizeWithActionHandler "Dariusz Luksza1-8/+8
2011-09-01Spelling errors in SynchronizeWithActionHandler Tomasz Zarna1-8/+8
Is 'entitys', should be 'entities'. Change-Id: I9f7f5b67b06aa336ead4e10a5992a1d53862ea1f
2011-08-31Add missing metadata to credentials package export.Kevin Sawicki1-1/+1
Previously the version and x-internal directive were not present. Change-Id: I86d910ae7d71b10e5946b5fcf7e4b8a5c9fc6bf8 Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-31Show messages in CommitDialog for errors that prevent committing.Kevin Sawicki4-2/+76
Previously validation was done when the Commit button was selected and dialogs were opened explaining why committing was not possible. Now these messages are displayed in the title area of the commit dialog and the Commit button is disabled when the commit cannot be completed. Bug: 355957 Change-Id: Iffb7f0b5dfdc70c465b4ffee0c3e27886cccf296 Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-31[repoView] Enable pasting a URI to initiate cloningMatthias Sohn6-10/+74
Enhance the "Paste Repository Path" command to start the clone wizard if the clipboard contains a git URI. Change-Id: Iaaddb1b51aa66ecd0e160fe4aaba19272939d54c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-30Fixes problem with single project repositories and GitFileHistorythallgren2-3/+62
The GitFileHistory class must consider empty relative path to project for repositories that contain one single project and the project contains the .git folder. This patch adds the necessary check to the GitFileHistory class and a JUnit test that verifies that the fix works as expected. Bug: 356020 Change-Id: I1b4fc3d6e818f39a7c7e5450b7325cea0dcdcce4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-30Add branding for EGit Mylyn featureSteffen Pingel1-1/+2
The EGit Mylyn feature is not listed in the About dialog. This change will make it show under the EGit branding icon. Change-Id: I1722e5f1f4220b586578baa9ab95f7d13188e037 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-28TaskReferenceFactory should set timestamp for commitsSteffen Pingel1-1/+3
Bug: 355990 Change-Id: Ifd07fc2f462d80f78521ca90eb6e2ddf4f78e2d0 Signed-off-by: Steffen Pingel <steffen.pingel@tasktop.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-28Diff node should notify listeners when the input changesRemy Suen2-2/+33
The text merge viewers need to be notified when changes to a compare input are saved. The text viewer can be notified of changes from the diff node. Hence, when the compare input itself has been notified that its been changed, this change event must be forwarded to the diff node so that the text viewer can be updated and reflect the differences of the newly changed compare input. Bug: 352576 Change-Id: I2f83544f271fea4a4e21f346218a75ef67bae623 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-28[sync] Fix refreshing workspace model after repository changeDariusz Luksza1-0/+10
Refreshing workspace model was broken after commit 521e41c because GitRemoteFile wasn't obtaining proper content of remote file. Bug: 355691 Change-Id: I47ca5ca7417cff7a86dae048733d1c90453d821a Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-28Don't ask Compare to open two editors for selected IFilesRemy Suen1-6/+1
The 'Git Tree Compare' view had incorrect logic that caused two editor open requests to be sent to Compare. This meant that when the 'Reuse Compare Editor' option was selected, the editor would get closed and when it wasn't selected, two compare editors would get opened. Removing the first request and letting the code cascade down to the request at the end of the method fixes this problem. Bug: 345631 Change-Id: I6b300a18e56af6059a34d751bb5c63abcb362c61 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-27Use the appropriate constant for ".git"Robin Rosenberg3-3/+3
We have two constants with the same content. DOT_GIT is intended for the git repository below the work tree, while DOT_GIT_EXT is the ".git" directory extension usually associated with bare repositories. Change-Id: I87d4ea8fcfbc2af130a74bd5ed02e8ee9d098c9f Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2011-08-25[historyView] Remove mnemonic definitionsRemy Suen1-4/+4
Having mnemonics defined for controls inside a part means that the user cannot use accelerators to access the menu items in the window's main menu bar. The 'History' view's controls should not define mnemonics as they may conflict with any definitions defined in the main menu bar. Bug: 331321 Change-Id: I5c34a9794870a9341f949487c797a46ed2cc64b3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-25Consider logical model when replacing filesBenjamin Muskalla4-26/+61
When replacing files from the repository, we should ask all model providers if this set of resources is consistent in itself or if we need to replace more resources to have a consitent model. Bug: 348060 Change-Id: I95ed9d53dbf8509fdd89f3c47b0280b6e40e946b Signed-off-by: Benjamin Muskalla <benjamin.muskalla@tasktop.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-25Consider logical models when staging filesBenjamin Muskalla1-2/+15
We need to take the model providers into account when staging files. This means that, once a file is staged, all necessary files for model consistency will be added too. Bug: 348060 Signed-off-by: Benjamin Muskalla <benjamin.muskalla@tasktop.com> Change-Id: I581fe4b261bb0037ebb6683f78a6d2461acad3da
2011-08-25Consider logical models in commit actionBenjamin Muskalla11-5/+590
While commiting files to the repository, we should ask all model providers if this set of resources is consistent in itself or if you need to commit more resources to have a consistent model. Bug: 346450 Change-Id: I79312945550580afee5b1c5a9fae06288a27867d Signed-off-by: Benjamin Muskalla <benjamin.muskalla@tasktop.com>
2011-08-24Properly handle TextSelections in Compare EditorsBenjamin Muskalla3-15/+17
Currently most menu items in the Team Menu have no effect inside Compare editors as we explicitly need to ask for IFile as their inputs don't adapt to IResource. Change-Id: I0ac6085b5d0d843bc179cddd912676fd07bed498 Signed-off-by: Benjamin Muskalla <benjamin.muskalla@tasktop.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-24Fix CCE comparing filesBenjamin Muskalla2-1/+30
Happens when you open a compare on a file in the Git Changeset mode and try to open the popup menu inside the compare editor. Bug: 354074 Change-Id: Iaa2e9a4feb89063be510cdb5f5f77a9abc2f8ca0 Signed-off-by: Benjamin Muskalla <benjamin.muskalla@tasktop.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-23"Paste Repository Path" should accept parent folder of git directoryMatthias Sohn1-6/+11
Change-Id: Ia05d1ee9a99bb38976a5b211033d7d2612c0f26e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-22Add file content assist to commit dialog.Kevin Sawicki5-5/+249
This makes it quicker and more accurate for the user to describe their changes in terms of the files being edited. Proposals are shown for all paths in the commit dialog with and without file extensions. Change-Id: Idaca2860aa6fbd1c773fb6273906c1f97797dbfc Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-20[findBugs] Do not ignore return value of File.mkdir()Matthias Sohn1-2/+3
Change-Id: Ie5fc8a6a71e39e2eef5b0fd28892497293309f5c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-20[findBug] Use more efficient way to iterate Map entriesMatthias Sohn1-2/+4
This fixes warning WMI_WRONG_MAP_ITERATOR for this class. Change-Id: I85627ea06d6978e9d60b52003641d5eb18b9c241 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-19[stagingView] Enable file name mode by default.Kevin Sawicki1-0/+1
This mode handles long paths better and can still be disabled in the view drop-down menu if desired. Change-Id: Ia39443df6557e8d3fe2beec761ac0f0fdb3753fd Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-19Verify local repository in test setupKevin Sawicki1-0/+2
Change-Id: I9772a110a4d894c16f7bc99eadaceefd750f8df3 Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-19Merge "Move revert commit to core operation."Chris Aniszczyk7-19/+177
2011-08-19Merge "Move cherry pick to core operation."Chris Aniszczyk7-29/+183
2011-08-19Move revert commit to core operation.Kevin Sawicki7-19/+177
Revert handler now schedules a job to run the new operation in a user job that shows progress. Bug: 354499 Change-Id: I9a2336216f0bc1256073bff692c087cfbebff8cc Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-19Move cherry pick to core operation.Kevin Sawicki7-29/+183
Cherry pick handler now schedules a job to run the new operation in a user job that shows progress. Bug: 354498 Change-Id: I75e6d3be83a3e6057edc31400a55c57419bf2b30 Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-19Dispose created images in the tag creation dialogRemy Suen1-11/+5
SWTUtils' getDecoratedImage(*) method instantiates a completely new image when it is invoked so the returned image needs to be disposed when it is no longer needed. Change-Id: I749b9669bb56d85961d1b8d22cbd3d84a482bb9c
2011-08-18Merge "Add filter to CompareWithRevisionAction contribution."Chris Aniszczyk1-0/+3
2011-08-18[sync] Don't add empty path's to PathFilterDariusz Luksza1-2/+5
Empty path's are not allowed by PathFilter therefore they shouldn't be added into list of filtered path's. Change-Id: I8d69281f6538bb1336ce16c235359879c37cf2d2 Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2011-08-18Merge "[sync] Fix synchronizing on repo level in sync wizard"Matthias Sohn1-2/+2
2011-08-18[sync] Fix synchronizing on repo level in sync wizardDariusz Luksza1-2/+2
Previously when synchronize wizard was used for launching synchronization only selected project was included in results. Such behavior breaks compatibility with 'Synchronize Workspace' and 'Advanced Synchronization". Change-Id: I92d2ca66d8ab6c0b5309d468db517d7be6fe9dfa Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2011-08-18Let pull fail gracefully when offlineMatthias Sohn4-2/+22
Bug: 343577 Change-Id: I749482b0c2ccef69e2511048032a2305b7c42291 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-18Add filter to CompareWithRevisionAction contribution.Kevin Sawicki1-0/+3
Ensures this action will only be shown on IFile objects that are in a project associated with a Git repository. Bug: 354925 Change-Id: I824ae4cfb2aaa210b641f76fa34f9cc3eb21e8c7 Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-18Fix endless loop in patch DnDBenjamin Muskalla1-2/+4
We missed to increase the counter if there is already an existing patch directory while creating the new patch. This happens when you DnD a commit outside Eclipse to save it as file. Change-Id: Iefd0da113e8c7a47afb23c75ff174c5d563c2f3b Signed-off-by: Benjamin Muskalla <benjamin.muskalla@tasktop.com> Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-18Use resource encoding in getFileCachedRevisionTypedElementRobin Stocker1-1/+3
This fixes problems in compare actions that use index as base (Compare index with HEAD, Staging View and Synchronize View). When the workspace encoding is different from the encoding of the resource, the index side of the diff would be decoded incorrectly (while the other side would be decoded correctly), leading to spurious diffs. Bug: 345160 Change-Id: If84334131ad53732aeac595e43ac0972de359628 Signed-off-by: Robin Stocker <robin@nibor.org>
2011-08-17Merge "Dispose of created menus in commit dialog"Matthias Sohn1-18/+27
2011-08-17Dispose of created menus in commit dialogKevin Sawicki1-18/+27
Bug:354695 Change-Id: I61089cbbddbf63cad5c1778b38b59c63c88f391c Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-17Add broader matching of rebase reflog entriesKevin Sawicki1-1/+1
Change-Id: I6bb43b471c86b2828c2b5a33c45c63782663018d Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-17Fix compile error caused by moving CompareUtilsMatthias Sohn1-1/+2
Change-Id: I0404aab29a98df516ed55632de67eacc96b8abf1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-17Merge "[reflogView] Allow branch selection"Chris Aniszczyk5-58/+261
2011-08-17Merge "Show fetch and create branch icons in Reflog view"Chris Aniszczyk1-1/+5
2011-08-17Merge "CompareWithIndexAction: Fix encoding of index element"Stefan Lay2-1/+10
2011-08-17[reflogView] Allow branch selectionKevin Sawicki5-58/+261
The current branch is now shown in the upper right of the view and selecting the link allows the branch to be changed. Change-Id: I5e20900a95dc6901ee44dd6d38318a33594f8762 Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-17Show fetch and create branch icons in Reflog viewKevin Sawicki1-1/+5
Change-Id: I4d99fe6616850df78360cbc450dd7f805135da32 Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-08-17Allow dragging of commits from History viewBenjamin Muskalla5-2/+119
User are now able to drag & drop a commit into other applications (eg. text editor or file explorer) and will get the patch for this specific commit. Furthermore this allows better integration with existing plugins like Mylyn - drag and drop a commit onto the task editor to attach the commit as patch to the task. Change-Id: Ia27cb669230ec867deabc354cc657ab4721e7900 Signed-off-by: Benjamin Muskalla <benjamin.muskalla@tasktop.com>
2011-08-17Allow changing the lines of the patch contextBenjamin Muskalla4-6/+72
Change-Id: I49abe4035957d1b75575ced77fd0be4cbf936bc3 Signed-off-by: Benjamin Muskalla <benjamin.muskalla@tasktop.com>

Back to the top