Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2010-08-11Update of GitSynchronizeData APIDariusz Luksza7-60/+57
In Git synchronization we always operate on commit level changes therefore source and destination points should be always RevCommit objects. In case of synchronizing tags we should map given tag with proper RevCommit object. Instead of doing this multiple times on different levels I've add this resolution to GitSynchronizeData constructor. Change-Id: I6476b4940783d4b719d08d9c0c5bb3060b1ee412 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-11Merge "Preliminary support for ChangeSets"Chris Aniszczyk42-56/+2171
2010-08-11Merge "Make PropertyTester more robust"Mathias Kinzler1-1/+4
2010-08-11Make PropertyTester more robustJens Baumgart1-1/+4
PropertyTester fails with NPE when the underlying repository is corrupted. Lots of error popups are shown to the user and the user cannot remove the corrupted repository from RepositoriesView. Bug: 318535 Change-Id: Idbe3e064e3746791d4880e17281e241fd63eea7f Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-08-11Merge "Checkout branch: use common UI"Chris Aniszczyk9-149/+220
2010-08-11Merge "Hide Maven target directories from Eclipse"Chris Aniszczyk8-0/+88
2010-08-11Checkout branch: use common UIMathias Kinzler9-149/+220
This makes the "checkout branch" UI re-usable for both the Repositories View and the History View so that we have the same labels and so on. Change-Id: Id087c439eb06a8c0771c81a007667d0c35ecec98 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-08-11History View: improve "enablement" calculation.Mathias Kinzler9-77/+81
With the new command-based menu contributions implemented for the history view, we get lots of "Could not get the current input from the history view" messages in the log. This is because the enablement if calculated even if the history is not visible at all. This change does the calculation properly. Bug: 322255 Change-Id: I113532b98350434034564f03f9ab05627c4663e6 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-08-10Preliminary support for ChangeSetsDariusz Luksza42-56/+2171
Adds proper representation of git changes that occurs between two ref's. Changes are displayed as Team ChangeSet instance. All commits are listed as a child's of node that represent repository. Every commit node contains tree-list of all changed, added or deleted resources. Bug: 318473 CQ: 4400 Change-Id: I198bb3859463ee7e0e230e22cf06761391436cd8 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com> Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2010-08-10Git History View: cleanup and usabilityMathias Kinzler36-1096/+1227
This change is intended as first step to imporove the usabily of the Git History View. From the end user perspective, the following changes are noticeable: 1. there is a new toolbar button "Show all versions for the resource" which makes the "resource mode" explicit (in other words, we now have four radio buttons insted of three where selection of no button at all would represent the fourth option) 2. "Wrap comments" and "Fill paragraphs" is only available when the context menu is opened on the comment viewer 3. The file-specific menu entries (compare, open) were promoted to the top of the context menu if a file is selected Internally, all the "popupMenu" contributions were removed and replaced with command contributions and the corresponding actions were refactored out of the GitHistoryView class into handlers in order to improve maintainability. Change-Id: I318476873c0142e18e3cf8928ea693f3adaba1ab Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-10Merge "Fix DiscardChangesAction"Chris Aniszczyk1-1/+4
2010-08-10Merge "Git Clone wizard: better Exception handling"Chris Aniszczyk1-0/+4
2010-08-10Git Clone wizard: better Exception handlingMathias Kinzler1-0/+4
If an InvocationTargetException is caught, the target exception should be shown instead of the original Exception. Bug: 309587 Change-Id: I119d38ed54ba9694b27c87218abcfe8fb7cfd465 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-08-10Fix DiscardChangesActionJens Baumgart1-1/+4
Fix ArrayIndexOutOfBoundsException in DiscardChangesAction. Bug: 321846 Change-Id: I3d469664d593ff5773272760c2f5594af44ba96f Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-08-10Merge "Remove some more warnings"Chris Aniszczyk12-84/+113
2010-08-10Fix NPE in History ViewJens Baumgart3-1/+15
Bug: 322231 Change-Id: I7fda6a3517c97b5e0131f6bd90da4966eff68f86 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-08-10Remove some more warningsMathias Kinzler12-84/+113
Gets rid of 19 compiler and deprecation warnings. Change-Id: I8f75222043d8e6b091c702384c3c8cad927119ee Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-08-10Merge "Improve decorator performance"Mathias Kinzler3-33/+84
2010-08-10Improve decorator performanceJens Baumgart3-33/+84
Cut recursion to improve performance. Tracing was added. Change-Id: I92149e72337ef4c66707ac2e5eee37f7c8129170 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-08-10Merge "Fixed several warnings around ConnectProviderOperation"Mathias Kinzler3-37/+22
2010-08-09Hide Maven target directories from EclipseRobin Rosenberg8-0/+88
Change-Id: I804c8b4b4bcc907226dac1ea414a9eabad8bdc1c Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2010-08-09Support Team->Ignore on projectsJens Baumgart6-64/+230
Fix not working Team->ignore on project node. Move logic in IgnoreActionHandler to new class IgnoreOperation. Bug: 309589 Change-Id: Iafbd4e5b3575960fbb02357a896cde2893731366 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-08Repositories View: consistent icons and texts on New... actionsMathias Kinzler2-1/+9
The "New Branch..." action didn't have an icon, and the "Create Remote..." action was renamed to "New Remote..." and the icon added. Bug: 321863 Change-Id: I8f2210586494a4729d33ce9d82a096e544acb465 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-08Merge "Wrong icon in Repositories View: push"Chris Aniszczyk1-1/+1
2010-08-08Git History View: use system-specific line separator in clipboardMathias Kinzler2-2/+7
Currently, "\n" is always used when copying several entries from the history view commits or the file list into the clipboard. The system specific line separator should be used, though. Change-Id: Ia1b95890aeb6941fff6b7e3456ed540eee7d321e Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-08Fix exception in decoratorJens Baumgart1-1/+7
Fixes an exception logged on rebuild. Bug: 321987 Change-Id: I14890142dd8cc3e2f67c28fb5e548a531b4706a7 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-08Improve decorator performanceJens Baumgart1-1/+5
Abort decoration process early if resource is ignored. Change-Id: I2dad9faa9e90588fd9fc266edd5a5e81bea4ba60 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-08Fix UI test for commit after implementation of spell checkingRobin Rosenberg1-1/+1
Bug: 318530 Change-Id: I6c137d1816591f160cd35540a22755541db2bfff Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-07Merge "Repositories View: Fix "delete multiple branch" feature"Chris Aniszczyk1-1/+1
2010-08-06Set correct date when committing a mergeStefan Lay4-8/+137
The date was not set before. This is corrected with this commit. A test case was added. Change-Id: Icd4f750e84a4fb74133b05fdeec57a7faf612547 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2010-08-06Wrong icon in Repositories View: pushMathias Kinzler1-1/+1
The "push" node type still uses the "commit" icon which has been change recently. Change-Id: I253746f5b7c45484ea336ab11a575509abe60702 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-08-06Trigger a merge commit Stefan Lay5-13/+178
Allows to commit when merge conflicts are resolved. To avoid unnecessary complexity file selection is switched off in the commit dialog. Workspace selection is not taken into account. Uses JGit's commit command which handles determination of parents and resetting repo state. The merge message is preset in the dialog. No addititional hints are presented (like when using the command line). Bug: 318439 Change-Id: I855903ba2f620aaadf38d4de7268cffccf38b0a9 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2010-08-06Repositories View: Fix "delete multiple branch" featureMathias Kinzler1-1/+1
Deletion of multiple branches in the rpositories view is currently broken due to a bug introduced on change http://egit.eclipse.org/r/#change,1211 Change-Id: I29ea9f72cff3baeb98abdc33eb5207d438122353 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-08-05Fixes obtaining common ancestor in Synchronize viewDariusz Luksza24-1889/+1385
For obtaining common base ancestor I've used suggested RevWalk with RevFilter.MERGE_BASE. For API compatibility it is also used for obtaining remote variant. This patch also improves the GitResourceVariant implementation. I replaced all dependencies to the deprecated TreeEntry with the proper RevObject implementation. Bug: 317934 CQ: 4390 Change-Id: I8f5352862d01e5a5475a74f222241970cd7960ee Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-05Clean up the MANIFEST.MFChris Aniszczyk2-72/+25
Generally we should avoid uses clauses in our MANIFEST.MF; also added versions on exported packages. Change-Id: Ib87fae4ae05a94a7f89c7a229af181c9a863eb9b Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-05Merge "Cleanup temp dirs after test execution"Chris Aniszczyk6-17/+18
2010-08-05Merge "Decoration of ignored projects"Chris Aniszczyk1-4/+19
2010-08-05Merge "Change Change-Id when unchecking amend"Chris Aniszczyk1-30/+38
2010-08-05History View: Create Branch/Tag on commitMathias Kinzler20-220/+500
This allows to create a branch or tag on a commit by right-clicking the commit in the history view. Bug: 320469 Change-Id: I5a3a2db49b6713123d099969f6281d8231174899 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-05Fixed several warnings around ConnectProviderOperationBenjamin Muskalla3-37/+22
Removed suspect usage of Job to wait for a test result even though the operation in question can run synchronously. Removed parameter assignment in Operation and replaced ObjectWriter with ObjectInserter. Change-Id: I578d2e64d1fe5181395c518329b339339051d870 Signed-off-by: Benjamin Muskalla <bmuskalla@eclipsesource.com>
2010-08-05Decoration of ignored projectsJens Baumgart1-4/+19
The decorator now decorates a project resource correctly if the project resource is ignored. Change-Id: I489dd4248d9b368908d3cc2685234f03586935d9 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-08-05Cleanup temp dirs after test executionBenjamin Muskalla6-17/+18
Currently the EGit Core Suite fails to clean up the temp directories in my user dir. Instead of only deleting the working dirs, we now use the deleteTempDirs to ensure we cleanup everything that we create during the testrun. Also renamed getTempDir to createTempDir to reflect the real intention. Change-Id: I949e36ba0ae18b537fc9d5424af13fa8f2613046 Signed-off-by: Benjamin Muskalla <bmuskalla@eclipsesource.com>
2010-08-05Change Change-Id when unchecking amendStefan Lay1-30/+38
In the commit dialog, when I check "Amend previous commit" and later uncheck it the Change-Id is now set to ObjectId.zeroId() again. Change-Id: Ifd91ed7f4ed1745c54363b8469a8e83bfe7829da Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2010-08-04Export all packages for OSGiBenjamin Muskalla2-1/+54
As good Eclipse citizens we should export all packages we have in o.e.egit.core and o.e.egit.ui and mark them as x-internal accordingly. Change-Id: I9e45a93577442d77c5bdd5550bdf1f15ab1f3576 Signed-off-by: Benjamin Muskalla <bmuskalla@eclipsesource.com>
2010-08-04Distinguish "Push" and "Commit" iconsMathias Kinzler3-2/+2
Bug: 315590 Change-Id: Iece57604d122cc576a0c79151277b099b1791581 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-08-04Use project name from project description fileBenjamin Muskalla1-41/+8
When we have a .project file, we should always create the project metainformation based on this file. I don't see any reason to use the file path to determinate the project name. In addition, Platform.getLocation has nothing to do with the workspace but rather the working directory of the platform. Also refactored the ProjectRecord a little bit to simplify it. This also fixes bug 314035 to use the project name of the .project file. Bug: 314035 Change-Id: I589c510550946be9b92d00746c3f4bb91447d515 Signed-off-by: Benjamin Muskalla <bmuskalla@eclipsesource.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-04Provide gitignore support in commit dialogJens Baumgart1-97/+10
Gitignore support was added to the commit dialog. Furthermore the calculation of untracked files using a ResourceVisitor was removed. This is now done by the new TreeWalk based implementation of IndexDiff. Change-Id: I1a2e4d7048f21c039a9b7bde8f74e570573ec8a2 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-04Add some keyboard shortcuts to the Team context menu.Mathias Kinzler1-0/+23
M1+M3+U ("update") should be added once we have "pull" support. M1+M3+P ("create patch") should be added after the context menu of the history view was changed to use command contribution items instead of action contribution items. Bug: 314096 Bug: 306459 Change-Id: Ic996351a3cbf758bf22e6bf708b89c5e513328d5 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-03Merge "Use compare mode at double click on path in History View "Chris Aniszczyk2-1/+38
2010-08-03Merge "Fix wrong order of compare inputs"Chris Aniszczyk1-1/+1

Back to the top