Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2010-09-15Qualify post-0.9.3 buildsstable-0.9Matthias Sohn18-105/+105
Change-Id: I2d496343dbcf6d74cd2214fe14e0cfe1fa346ada Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-15EGit 0.9.3v0.9.3Matthias Sohn18-105/+105
Change-Id: I08460e3688d074278cad826b7193b622b8581392 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-15Qualify post-0.9.1 buildsMatthias Sohn18-105/+105
Change-Id: I28529d8df1d2992607ff229db5b6045015790018 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-15EGit 0.9.1v0.9.1Matthias Sohn18-105/+105
Change-Id: I46b5f2c26467365aafc0300499e8e404ebb25b8f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-15Fix broken <p> tags in html pageMatthias Sohn1-4/+2
Two missing </p> closing tags caused sax parser exceptions when opening the "Reference" chapter in Eclipse help. Change-Id: Ie1ce7a0345001695d3c44cbe05a6f04090bf8bdf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-14Update help plugin with 0.9 documentationMatthias Sohn135-481/+3950
Change-Id: I57056604006bb198fd5da7a96875f2ed331a685c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-14Include 0.9 news and noteworthy into documentationMatthias Sohn1-0/+2
Change-Id: If55073c50a275e9c0c25747cd5199b3f17bdfaa2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-14Take core.filemode into account in for dirty decorationStefan Lay1-1/+9
A resource was marked as dirty when the file mode differed even if the config setting core.filemode was set to false. This is fixed with this commit. Bug: 307560 Change-Id: I68de4a298653e0e23030fe053f73bfa3c5df74b6 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2010-09-13Fix NullPointer in HistoryViewStefan Lay1-5/+3
With 7f6821cfd3b577bbb82f12e54f36cd8e6d1904da a NullPointer was introduced. This is fixed with this commit. Now currentWalk is not set to null per default and it is only released if necessary. Because cancelRefreshJob() may set currentWalk to null it has to be newly created in case it is null. Bug: 324943 Bug: 325081 Change-Id: Iccea8f6053a461a5e2562bdf4edcf03ad45b4ae3 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2010-09-09Sort roots by full path to ensure stable assertion resultsMatthias Sohn1-3/+13
GitResourceVariantTree uses a HashSet to store resource variants which doesn't guarantee stable sort order which may break the assertions in GitResourceVariantTreeTest.shouldReturnTwoRoots() [1]. To fix this we sort the roots before doing assertions. [1] http://dev.eclipse.org/mhonarc/lists/egit-dev/msg01497.html Change-Id: If92b0bb43bfb0a022df6fefb98b06b00ace03c35 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-09Merge "Update Eclipse compatibility note in README"Chris Aniszczyk1-1/+1
2010-09-09[repoView] Add a "clear" command image to "Remove Repository"Mathias Kinzler2-0/+4
Change-Id: I96792263a26f8052dd882e30aff6b2eec9d34cb0 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-09-09Fix broken optimization in GitHistory page when neither path nor HEAD changeRobin Rosenberg1-0/+1
Bug found by Mathias Sohn when reviewing other cleanups. Change-Id: Ib6336db04ee8fae98588671a880a1c08f194c84d
2010-09-09Merge "[historyView] Disable Comment and Detail panes on multiple selection"Matthias Sohn5-9/+69
2010-09-09[historyView] Disable Comment and Detail panes on multiple selectionMathias Kinzler5-9/+69
This confuses users. Instead a message text is shown. Bug: 324716 Change-Id: Ic784028b8c2cb2d9244d6a352196ca381e2022f7 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-09Merge "Resolve handler conflict for merge command"Stefan Lay1-2/+4
2010-09-09Update Eclipse compatibility note in READMEMatthias Sohn1-1/+1
Change-Id: I65cefd0a8d5d51fa3f2eda1f81a5a774e6115622 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-09Clone operation should run in backgroundBenjamin Muskalla9-128/+166
As cloning is a long-running task, it should always run as background job with a non-modal dialog. Introduced a job family so we can easily join on the Clone operation to wait for it to finish. Bug: 318578 Change-Id: I7163fdf1794c1f0021909477a03917320fe72db2 Signed-off-by: Benjamin Muskalla <bmuskalla@eclipsesource.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-09Merge "ChangeSet implementation shouldn't be aware of .gitignore"Stefan Lay1-6/+1
2010-09-09Merge "Disable source branch selection when local changes are included"Stefan Lay2-0/+19
2010-09-09Update .eclipse_iplog for 0.9Matthias Sohn1-1/+1
EGit 0.9 depends on JGit 0.9. Change-Id: Ia01fffe01fc51872080970b8a6cebc2a5f6d4040 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-09Disable source branch selection when local changes are includedDariusz Luksza2-0/+19
When local changes are included in synchronization current HEAD must be used as source branch. Therefore selection of source branch in Synchronization Dialog is disallowed when "include uncommited local changes" check box is selected. Change-Id: I40c94ccac098b1bfb359e492f8cf76b468b0d76e Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2010-09-08Merge "Use remote name as default value when synchronizing"Dariusz Luksza3-4/+16
2010-09-08ChangeSet implementation shouldn't be aware of .gitignoreDariusz Luksza1-6/+1
Since in ChangeSet implementation we are dealing only with committed changes it shouldn't be aware of .gitignore configuration. According to gitignore documentation[1] the .gitignore entry's concern only not tracked files. [1] http://www.kernel.org/pub/software/scm/git/docs/gitignore.html Bug: 324705 Change-Id: I7c2bd2808644e317618317ce33cea508f5a4b2c4 Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2010-09-08Update .eclipse_iplog for 0.9Matthias Sohn1-0/+5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-08Merge "Add maven profile to enable skipping UI tests"Chris Aniszczyk1-0/+14
2010-09-08[historyView] FindToolbar: layout and mnemonicsMathias Kinzler3-7/+16
1. fix the search text field to not grab vertical space 2. add mnemonics to the field label and previous/next buttons 3. add tooltips to the previous/next buttons Change-Id: Idace65ba4e627a39dc74560584fc9fbe28ed29a1 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-08Use remote name as default value when synchronizingBenjamin Muskalla3-4/+16
Instead of using "origin" as remote name, we should determinate it depending on the repository and only fall back to origin in case it's not clear. Bug: 324141 Change-Id: I6a05354fd19fc1ccfc7d6b3ae6c8205c757786b9 Signed-off-by: Benjamin Muskalla <bmuskalla@eclipsesource.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-08Add maven profile to enable skipping UI testsMatthias Sohn1-0/+14
Since we now want to enable core tests on Hudson, but we still have no solution for bug 314811 we need a way to skip the UI tests on Hudson. Change-Id: I301480b5a0a15805cd969f85d3ab0bc7ac638d37 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-08Clear RepositoryCache after each test to fix core testsJens Baumgart2-0/+12
With this fix the core test suite is running also on Mac. Reason for the failures before was the usage of out-dated Repository instances contained in RepositoryCache which caused spurious failures when running the full test suite while running tests individually always succeeded. A follow-up fix should care for the life cycle of Repository objects in RepositoryCache. Change-Id: I1f16a9de48435bd98e2520e34e49bc1ca6893f14 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-08Resolve handler conflict for merge commandMathias Kinzler1-2/+4
Both the merge command handlers were "active" if nothing was selected. They should instead both be inactive. Bug: 324517 Change-Id: Iece3fd33c74ba903e9b4f091c4fae3f5eebe50b6 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-09-08Merge "Remove unused and duplicate message keys and messages"Mathias Kinzler2-277/+0
2010-09-07Remove unused and duplicate message keys and messagesMatthias Sohn2-277/+0
Problems found using Source > Find Broken Externalized Strings Bug: 320489 Change-Id: I160634f19ceb7f1b030f2864032310b4354693e2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-07Add simple HTML page explaining purpose of p2 repositoryMatthias Sohn3-282/+38
This helps users to understand the purpose of the software repository. Replaces the previous not working scripting solution. Bug: 318336 Change-Id: I446a5e40648f3334c822431c5523cea21d6aa1ec Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-07Merge "Fix problems when pushing to a remote that has only a Push URL"Stefan Lay6-29/+55
2010-09-07Supportability: Provide a Trace Configuration Preference PageMathias Kinzler9-2/+774
Since we have the infrastructure in place, we can now switch debug tracing on and off in a running IDE. This can be very helpful in situations where we can't debug. Unfortunately, there is no generic UI to do this, so this adds a dialog to show the existing trace locations for the EGit UI and EGit Core plug-ins and allows to activate them. The dialog cannot be started from a "normal" UI control, but only using CTRL-3 and triggering a dedicated command "Configure Git Debug Trace" in order to avoid pollution of the Preference UI. Change-Id: I4681acf85de8d05be6290d88acde5d99453ce89d Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-07Merge "Use default RawTextComparator to compute Myers diff"Stefan Lay1-2/+3
2010-09-07Use default RawTextComparator to compute Myers diffMatthias Sohn1-2/+3
EGit build was broken by JGit API change [1]. As a next step we should make the comparator configurable. [1] http://egit.eclipse.org/r/#change,1502 Change-Id: I1bf037d2de811bb94242eaadf39f3a1c0b82acc1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-07Merge "Fix deletion problem in EGit Core tests"Matthias Sohn1-4/+21
2010-09-06Append commit id at the end of the changesetBenjamin Muskalla2-3/+42
To declutter the Synchronize view with many changesets, the commit id should be at the end of the changesets name and in a lighter color then the rest of the text. Bug: 324365 Change-Id: I5f15413cf3f44613fc6f56bb45c7c9744eb2615c Signed-off-by: Benjamin Muskalla <bmuskalla@eclipsesource.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-06Merge "Skip bare repositories when looking for selection"Chris Aniszczyk1-0/+2
2010-09-06Merge "Run core tests head-less also from Maven"Chris Aniszczyk1-1/+2
2010-09-06History View: fix view menuMathias Kinzler4-81/+111
Eclipse UI Guidelines mandate that all toolbar actions should also appear in either the toolbar menu or a context menu. This adds the toolbar items to the view menu where possible and also adds specific menu label texts with mnemonics instead of the lengthy tooltips currently re-used in the menu. Change-Id: I068a6dcc599fe7d13810d1e2519cb8fa578cefa0 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-06Fix deletion problem in EGit Core testsJens Baumgart1-4/+21
EGit core tests sometimes fail because TestUtils.deleteRecursive can not delete a file. To workaround the problem the deletion is retried 10 times. Change-Id: Ia25c9304884c95f54e8e7b98ed49dd044fa7b95b Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-09-06Implement dialog to display a merge resultJens Baumgart5-6/+238
A dialog was implemented to display the result of a merge. Change-Id: I0f24afff6aefc93c300ba20491a83256139d08cb Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-06Run core tests head-less also from MavenMatthias Sohn1-1/+2
From Eclipse we run the egit core tests head-less on plain osgi so there is no need to run them in UI thread nor using UI harness when running these tests from Maven. Change-Id: I84d86b66b2da3a5a1af00b14e1b12ea27ed11aaa Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-06Merge "Fix AddOperationTest"Matthias Sohn1-1/+1
2010-09-06Merge "Fix IgnoreOperationTest"Matthias Sohn1-0/+10
2010-09-06Skip bare repositories when looking for selectionStefan Lay1-0/+2
The code tried to find an entry in the "Working directory" node which corresponds to the editor input. This led to an exception if there was a bare repository in the list. Bug: 324588 Change-Id: I98c541d4e5a0c78dd928885e799905cc1f5ac1c7 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2010-09-06Merge "cleanup: Remove unnecessary @SuppressWarnings"Stefan Lay1-8/+0

Back to the top