Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2010-12-17Qualify post 0.10.1 buildsstable-0.10Matthias Sohn2-11/+11
Change-Id: I87f6bacbb0e1b01f692bae4ccb7d47139d0d9272 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-16EGit 0.10.1v0.10.1Matthias Sohn2-11/+11
Change-Id: I704a092b79cf6280c862805ccec5336526e470ba Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-14Fix cloning a repository with detached HEADStefan Lay2-2/+6
The clone wizard could not handle remote repositories where the HEAD is no branch. The SourceBranchPage threw an exception in the LabelProvider. When the user selected "HEAD" on the CloneDestinationPage the cloned repository was inconsistent. Furthermore it is now possible to use the CloneOperation with arbitrary Refs, not only with refs/heads/*. Bug: 326693 Change-Id: Ibd999956bbecee148dbfd4ceb997741c09e3f87e Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-09[findbugs] Do not ignore exceptional return valueMatthias Sohn6-58/+29
java.io.File.delete() reports failure as an exceptional return value false. Fix the code which silently ignored this exceptional return value. Also remove some duplicate deletion helper methods. This change depends on jgit change I430c77b5. Change-Id: I61508c944a88277929e5653ba78f5ad1973e4873 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-08Adapt egit to jgit change Idb176736Matthias Sohn1-4/+1
JGit change Idb176736fa0dc97af372f1d652a94ecc72fb457c changed handling of WorkingTreeOptions and filemode breaking the egit build. Change-Id: Iee407b7bfb3c65df5c3562b3bdabb5637f04b481 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-12-08Fix AdaptableFileTreeIteratorTestJens Baumgart1-1/+1
AdaptableFileTreeIteratorTest was broken by JGit change a02be9725c9f83f0a0280a9a1f00e8d484825885 Change-Id: Ice5d48dfbb132312d34ad234b2d3a1aa267daf26 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-12-05[findbugs] Ensure closing writer in finally blockMatthias Sohn2-6/+16
Change-Id: Ifd117e7a6c567d5e1a34192bf3b6db9964606638 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-02[findbugs] Unwritten store field in GitResourceVariantTreeTestDariusz Luksza1-5/+2
org.eclipse.egit.core.synchronize.GitResourceVariantTreeTest.store Pattern id: UWF_UNWRITTEN_FIELD, type: UwF, category: CORRECTNESS Bug: 331625 Change-Id: I16271df409ccecfa62e2fa84afcce17d945c8808 Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2010-12-01[findbugs] Remove unread fieldMatthias Sohn1-5/+0
Change-Id: Ief270304c07596f9dd3a4207ae0afb8b0c30fa5d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-01Authentication: add option to store password in secure storeJens Baumgart1-0/+12
Now storing the credentials is optional in the clone/fetch/push/configure fetch/configure push wizards. Change-Id: Ic91d7bc86a3158f15fa112069369294c8b43022e Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Philipp Thun <philipp.thun@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-01Remove deprecated JGit code from EGit Core TestsMathias Kinzler2-68/+46
Change-Id: Ia168e795a93261d3d2da161f76200ba7a0ab7924 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-11-30Implement basic authentificationJens Baumgart1-0/+150
Implementation of basic authentification with user and password. User and password entered in the clone wizard are put in the Eclipse secure store. A credentials provider was implemented that fetches credentials from the secure store and asks the user if credentials are not available. Change-Id: I5239c6595e39d2a855318649fccc8fe8ac5e5fb8 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Edwin Kempin <edwin.kempin@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-11-28Replace calls to StringBuffer with StringBuilderRemy Suen1-1/+1
It is not necessary to use StringBuffer if no synchronization is required. Change-Id: Id03f6482db70e5f1a174713f5b14f12fd2fd7f56 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-11-23Add a Rebase OperationMathias Kinzler1-0/+238
As a prerequisite for implementing the Rebase action in the UI, this adds the underlying operation. Change-Id: I9170ffd13b9554b0f19f539387f824e3bb44c018 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-11-09Fix EGit build errorJens Baumgart1-1/+1
Commit 2fb0f5cfc067cb20f178cf4db7395b394b48783b Make Repository.shortenRefName static broke the EGit build. Change-Id: I923f0ea760d71aa76ca8eaeddbcc72c8b3b07e6e Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-10-26[findbugs] Remove invocation of new String(String) constructorRobert Munteanu1-1/+1
Using the java.lang.String(String) constructor wastes memory because the object so constructed will be functionally indistinguishable from the String passed as a parameter. Change-Id: I46617366a17047dfdaef309bddfd172379da5196 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-10-25Add FindBugs and CPD to the buildChris Aniszczyk1-0/+8
Bug: 327799 Change-Id: I5802ea361d82eceb283a91178b41f044c29c4df4 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-10-01Remote connections: allow to configure a timeoutMathias Kinzler2-9/+9
This adds a preference page with a "remote connection timeout" that lets the user configure a timeout for remote connection. 0 is the default and corresponds to no timeout. The different operations opening Transport instances use this timeout and set in the Transport instance. Bug: 322242 Change-Id: I150b7bd4ad1c8c74061562f6a3b5958e0643a4de Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-10-01Fix failing Core TestsStefan Lay3-40/+6
Fixes the tests which fail since commit 56d406b. Change-Id: I94793d6c90d98d407b55c05dbc4357192e1cfd13 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2010-09-19Remove unnecessary overridesMatthias Sohn1-5/+0
Overrides that only call the super class implementation are unnecessary. Change-Id: I8f3b917bdb92e7fcc7f89ef53628d05bbfd5771c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-16Qualify builds as 0.10.0Shawn O. Pearce2-11/+11
Change-Id: I2492ee9172d957ed4907117c3d5b5e4486e07bf6 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-16Merge branch 'stable-0.9'Shawn O. Pearce2-11/+11
* stable-0.9: Qualify post-0.9.3 builds EGit 0.9.3 Qualify post-0.9.1 builds EGit 0.9.1 Fix broken <p> tags in html page Update help plugin with 0.9 documentation Include 0.9 news and noteworthy into documentation Take core.filemode into account in for dirty decoration Fix NullPointer in HistoryView
2010-09-15Qualify post-0.9.3 buildsstable-0.9Matthias Sohn2-11/+11
Change-Id: I2d496343dbcf6d74cd2214fe14e0cfe1fa346ada Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-15EGit 0.9.3v0.9.3Matthias Sohn2-11/+11
Change-Id: I08460e3688d074278cad826b7193b622b8581392 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-15Qualify post-0.9.1 buildsMatthias Sohn2-11/+11
Change-Id: I28529d8df1d2992607ff229db5b6045015790018 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-15EGit 0.9.1v0.9.1Matthias Sohn2-11/+11
Change-Id: I46b5f2c26467365aafc0300499e8e404ebb25b8f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-13Merge "Adds support for comparing two remote branches"Stefan Lay1-20/+20
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-09Adds support for comparing two remote branchesDariusz Luksza1-20/+20
The main reason of not displaying synchronization data for two remote branches was that GitResourceVariantTreeComparator was using standard SyncInfo class which uses local file to determine change kind. The new GitSyncInfo is looking for a first diff for given file in given range of commits. Based on this it determines change kind and direction. Git specific SyncInfo is activated only when the user doesn't select "include locally changed files" in synchronization dialog. When this option is selected standard implementation of SyncInfo will be used. Additionally "Workspace" model is only enabled when "include locally changed files" option is selected, in other case this model will be excluded. Bug: 324044 Change-Id: Ia0cf491657a6c9a01d68992457a25d15c5718428 Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2010-09-08Clear RepositoryCache after each test to fix core testsJens Baumgart1-0/+4
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-07Merge "Fix deletion problem in EGit Core tests"Matthias Sohn1-4/+21
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-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-06Fix AddOperationTestJens Baumgart1-1/+1
Fixed small bug in AddOperationTest. Change-Id: Ib15b43cf9341f669911fcf65671e139373eb13ee Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-09-06Fix IgnoreOperationTestJens Baumgart1-0/+10
IgnoreOperationTest did not clean up .gitignore in the workspace folder. This caused subsequent test to fail. Change-Id: Icc3e3e02302a8189ae2009e24682206d8bff086e Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-09-04cleanup: Remove unnecessary @SuppressWarningsRobin Rosenberg1-8/+0
Change-Id: Ic9a424cfdfcebbf2ff548f6741d2f96a1494df0e Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2010-09-01Fix EGit to use JGit's api.errors packageShawn O. Pearce2-6/+7
Change-Id: I27ec972b0d42b495c1f0c26ec0d76e644224e590 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-08-31Remove usage of deprecated PersonIdent constructorMathias Kinzler1-2/+2
Change-Id: I7706a916f8388bbae948d550005584cadb1e836a Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-08-30Add tests for IgnoreOperationBenjamin Muskalla3-6/+130
In order to have a better test coverage before fixing and refactoring other changes, we need to ensure to have at least most of the features covered by tests. In addition, fixed minor bug to really use the scheduling rules we create. Change-Id: If63a9632b28aeb7d6ef585f889876ec42dac2c0c Signed-off-by: Benjamin Muskalla <bmuskalla@eclipsesource.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-28Revert "Hide Maven target directories from Eclipse"Robin Rosenberg1-11/+0
This reverts commit 9425360ad8b57aa7020be44481ad6ed771a7261c since it breaks compatibility with Eclipse 3.5 which can no longer import the projects Bug: 323390 Change-Id: Icda21a1e00a63b1e7333b89525af04d6a776b178 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2010-08-25Cleanup of HistoryTest and IndexFileRevisionBenjamin Muskalla1-73/+47
Fixed several warnings, added testcase for the IndexFileRevision and rewrote test setup to use porcelain API instead of the plumbing stuff. Change-Id: Ia568de2231e12f62f8415ca32c8aba5c89abf7b5 Signed-off-by: Benjamin Muskalla <bmuskalla@eclipsesource.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-23Remove ObjectWriter and replace it with ObjectInserterShawn O. Pearce2-25/+49
JGit won't support the deprecated ObjectWriter API anymore, so we have to use the newer ObjectInserter style throughout EGit. Change-Id: I95e2c705af5d7ff6c2e7da78ec3a60a1c718708e Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-08-23Adapt to JGit's CommitBuilder, TagBuilder API changeShawn O. Pearce3-7/+7
Change-Id: I5d69fca2b8a168b68df7d93b23f5705c49638011 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-08-20Replace deprecated Tag, Commit usage with RevTag, RevCommitShawn O. Pearce3-17/+16
JGit is changing its API to no longer make Tag and Commit classes accessible for reading purposes. The only thing they will support is the creation of new objects, and even then their APIs are moving to a simpler and more consistent usage style. Replace relevant uses of tags and commits with their RevWalk based variants, fixing any build breakages caused by this JGit change. Change-Id: I070e309894989024b26be7638bbfcc62a9a4b00d Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-08-18Keep up with Tag API changesChris Aniszczyk1-1/+9
The Tag API from JGit was changed to remove duplication. Change-Id: I562198f7a6c21b659e78339ef8c4d9d2bff248ab Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-12Fix for bug in GitResourceVariantComparatorDariusz Luksza1-2/+22
When comparing local folder with folder that wasn't exist remotly GitResourceVaraintCompare return that both resources are equal. I've added additional condition for resource existence. Change-Id: Ie8b97fffd1237723afce6aed3c116b280694b3ba Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2010-08-11Improve GitResourceVariant performanceDariusz Luksza1-23/+29
Recursive TreeWalk's for obtaining objectId were replaced by additional onstructor parameter, this change should improve performance of synchronize action. Change-Id: I6c221ee7a1f754262d008bffe5103d37082773dc Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-08-11Update of GitSynchronizeData APIDariusz Luksza2-21/+37
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>

Back to the top