summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Update Jetty to 7.6.14.v20131031Matthias Sohn2013-11-183-35/+35
| | | | | | | | Change-Id: Icb7f91e40d2a216fda519c64a94d5ad18eac683c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Don't delete .idx file if .pack file can't be deleted"Robin Rosenberg2013-11-172-18/+75
|\ \
| * | Don't delete .idx file if .pack file can't be deletedChristian Halstrick2013-11-132-18/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If during an garbage collection old packfiles are deleted it could happen that on certain platforms the index file can be deleted but the packfile can't be deleted (because someone locked the file). This led to repositories with packfiles without corresponding index files. Those zombie-packfiles potentially consume a lot of space on disk and it is never tried to delete them again. Try to avoid this situation by deleting packfiles first and don't try to delete the other files if we can't delete the packfile. This gives us the chance to delete the packfile during next GC. This commit only improves the situation - there is still the chance for orphan files during packfile deletion. We don't have an atomic delete of multiple files . Change-Id: I0a19ae630186f07d0cc7fe9df246fa1cedeca8f6
* | | Document that path parameters should use '/' as separatorRobin Stocker2013-11-1514-22/+36
| | | | | | | | | | | | | | | | | | Bug: 421600 Change-Id: I505d994518aa608aaa797252433b6c97e2def5b4 Signed-off-by: Robin Stocker <robin@nibor.org>
* | | Improve Javadoc for typeHint parameterRobin Stocker2013-11-143-15/+17
| | | | | | | | | | | | | | | | | | | | | Link to an example type constant. Change-Id: I214ab834fa02901a38e6048a94a5224b30c5d93f Signed-off-by: Robin Stocker <robin@nibor.org>
* | | Do not update the ref hot bit when checking isIndexLoadedColby Ranger2013-11-132-1/+5
| |/ |/| | | | | | | | | | | | | | | | | DfsPackFile.isIndexLoaded() uses the DfsBlockCache.Ref.get() method to check if the index loaded. However, using the get() method marks a hot bit in the cache, which can cause the index to never be unloaded and seem hotter than it really is. Add a has() method which only checks if the value is not null and does not update the hot bit. Change-Id: I7e9ed216f6e273e8f5d79ae573973197654419b4
* | Update to Ant 1.9.2Matthias Sohn2013-11-121-1/+1
| | | | | | | | | | CQ: 7698 Change-Id: I2ae580041eb334c613969bc9d66d169d08c12c4d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Add missing @since tags"Matthias Sohn2013-11-127-0/+14
|\ \
| * | Add missing @since tagsMatthias Sohn2013-11-097-0/+14
| | | | | | | | | | | | Change-Id: Ic4fabec818d6fe336d3256ddc95934271272914a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Add uses directives to ensure OSGi wires jgit bundles correctlyMatthias Sohn2013-11-125-37/+129
| | | | | | | | | | | | | | | | | | | | | | | | See http://spring.io/blog/2008/10/20/understanding-the-osgi-uses-directive/ Bug: 420903 Change-Id: I3706a2b8f695d4ce0ee2333722ed7b8d31032f1e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Introduce Kepler and Luna target platformMatthias Sohn2013-11-124-2/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this to enable building jgit with dependencies from Orbit version used by Luna. Default target platform is Kepler. In order to use Luna run mvn clean install -P platform-luna -f org.eclipse.jgit.packaging/pom.xml Change-Id: I544516d97067f45d1034929b534ad1600136614d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Update build to use Tycho 0.19Matthias Sohn2013-11-111-2/+2
| |/ |/| | | | | Change-Id: I90f71f2612a934e83a0af8dccfe08592e4532ddf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | [findBugs] Remove nonsense callMatthias Sohn2013-11-101-1/+0
| | | | | | | | | | | | Result of c.containsAll(c) is always true for any collection c. Change-Id: I853cbb44bdc03e2b54229bb9c36ae42e02dcc4d9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Remove unnecessary @SuppressWarnings("null")Matthias Sohn2013-11-101-5/+0
| | | | | | | | Change-Id: I5bddcdab2c5cc92622144a7b207bad90cb601609 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Grant access to internal jgit package to org.eclipse.jgit.junitMatthias Sohn2013-11-101-1/+2
| | | | | | | | | | | | | | This silences some discouraged access warnings issued since TestRepository uses PackWriter which is in an internal package. Change-Id: Ic9c4631e237c2fe1996c518328ecc2a9ab5c348b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Remove duplicate package exportMatthias Sohn2013-11-101-3/+0
| | | | | | | | Change-Id: I185610f12069cd4ce1b27650581375b6b3019d2f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Don't import non-existing package org.eclipse.jgit.java7Matthias Sohn2013-11-102-2/+0
|/ | | | Change-Id: Idc48cb1995050913498d2bad97a8e6e330dee94c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Interactive Rebase: Do actions if there were conflictsStefan Lay2013-11-082-80/+324
| | | | | | | | | If a commit was marked for edit, reword, squash or fixup, but the interactive rebase stopped because of a conflict, the step was not done after conflict resolution. This is done now. Change-Id: If8e7ccc50469165744f2b8a53d180f9ba0f72330 Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Rebase interactive should finish if last step is editStefan Lay2013-11-062-9/+47
| | | | | | | | When the last step was an edit step, rebase interactive did not finish after continuing the rebase. Instead, it returned with the status FAST_FORWARD. Change-Id: Ib19857474ac089dfeaae665ad5e95c66c21099b0
* Merge changes I40f2311c,I3c419094Matthias Sohn2013-11-057-12/+620
|\ | | | | | | | | | | * changes: Add additional RebaseResult for editing commits Add Squash/Fixup support for rebase interactive in RebaseCommand
| * Add additional RebaseResult for editing commitsStefan Lay2013-11-053-9/+20
| | | | | | | | | | | | | | | | | | With the new RebaseResult.EDIT a client can now distinguish if rebase stopped due to a conflict or because the commit was marked for edit in an interactive rebase. Change-Id: I40f2311cf43ed5f290dcda65a7bd85ba770a85f5 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
| * Add Squash/Fixup support for rebase interactive in RebaseCommandTobias Pfeifer2013-11-056-3/+600
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rebase command now supports squash and fixup. Both actions are not allowed as the first step of the rebase. In JGit, before any rebase step is performed, the next commit is already cherry-picked. This commit keeps that behaviour. In case of squash or fixup a soft reset to the parent is perfomed afterwards. CQ: 7684 Bug: 396510 Change-Id: I3c4190940b4d7f19860e223d647fc78705e57203 Signed-off-by: Tobias Pfeifer <to.pfeifer@web.de> Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge changes ↵Shawn Pearce2013-11-0530-136/+412
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | I85470d1d,I43711486,Ie6ade781,Ic9ab2b6e,Iebe50933,Id6fac253,Ia6becf30,I2af8b0ac * changes: Use absolute paths for file:// URIs in tests Use getPath() in FileResolverTest Extract protocol constants to a common class Move repeat() to utility class for tests Remove hardcoded target/trash from test cases Remove dependency on StatusCommandTest Remove dependency on DiffFormatterReflowTest Remove unnecessary import of BaseConnection in MessageWriter
| * Use absolute paths for file:// URIs in testsShawn Pearce2013-11-019-31/+44
| | | | | | | | | | | | | | | | When run under Buck the repository paths may be relative. Request an absolute path to construct the URI, as relative paths are not supported in file:// style URIs. Change-Id: I85470d1db2f4e80cba30f1559c0d99bdfa8ac410
| * Use getPath() in FileResolverTestShawn Pearce2013-11-011-1/+1
| | | | | | | | | | | | | | Necessary to get tests to pass when running under Buck. Has no impact on Maven based invocation of tests. Change-Id: I437114863df0bac346c94ef13796def47333d916
| * Extract protocol constants to a common classShawn Pearce2013-11-017-50/+202
| | | | | | | | | | | | This avoids the server from referencing the client code directly. Change-Id: Ie6ade781b5a689646ad8b0b2988ef2b544412195
| * Move repeat() to utility class for testsShawn Pearce2013-11-013-12/+59
| | | | | | | | | | | | | | | | Avoid depending on AutoCRLFOutputStreamTest from within another test such as AutoCRLFInputStreamTest. Breaking the dependency up allows the test classes to be built and executed in parallel. Change-Id: Ic9ab2b6ec74ac87ff4adda8a802ae343dd2a6235
| * Remove hardcoded target/trash from test casesShawn Pearce2013-11-015-10/+27
| | | | | | | | | | | | | | | | | | | | | | Buck does not create a target directory for the build output, this is Maven specific and the project unit tests should not rely on it. Instead follow the pattern used by org.eclipse.jgit.test which is to create a temporary directory in the system temporary folder, and configure the Maven surefire plugin to use the target directory. Change-Id: Iebe5093332343a90f51080614e083aac0d29c26d
| * Remove dependency on StatusCommandTestShawn Pearce2013-11-013-24/+71
| | | | | | | | | | | | | | Move the set constructor function to a Sets utility class, allowing the tests to compile in parallel. Change-Id: Id6fac2533fab8d423f949c892f199af2491a450b
| * Remove dependency on DiffFormatterReflowTestShawn Pearce2013-11-011-6/+7
| | | | | | | | | | | | | | Reference the resource from the root of the CLASSPATH, allowing the test classes to be compiled in parallel with no dependencies. Change-Id: Ia6becf30ccfe93b8585b82293d9a4863b0cf837e
| * Remove unnecessary import of BaseConnection in MessageWriterShawn Pearce2013-11-011-2/+1
| | | | | | | | Change-Id: I2af8b0ac0f9fbf2814eca23990ae527baf040539
* | Merge "Declare that org.eclipse.jgit.transport uses com.jcraft.jsch"Matthias Sohn2013-11-051-1/+1
|\ \
| * | Declare that org.eclipse.jgit.transport uses com.jcraft.jschMatthias Sohn2013-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This should prevent class cast problems caused by jgit and egit bundles wiring to different versions of com.jcraft.jsch. Bug: 420903 Change-Id: Icabe40209ea07369e2b7eee31952d131aef3fbf1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Also use MockSystemReader in GitDateParserBadlyFormattedTestMatthias Sohn2013-11-051-0/+14
|/ / | | | | | | | | | | | | | | | | | | | | | | | | All tests should use MockSystemReader to isolate them from the underlying platform specifics. GitDateParserBadlyFormattedTest wasn't using MockSystemReader which induced Bug 420772 as a side effect since GitDateParser caches SimpleDateFormat instances without regarding their locale. This will be fixed in another change Bug: 420772 Change-Id: I798e55d05730a71bb0326f80aea5488541d6c1f2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "testMaliciousPathEmpty fails on Windows"Christian Halstrick2013-11-042-4/+12
|\ \
| * | testMaliciousPathEmpty fails on WindowsRobin Rosenberg2013-11-012-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | Checking of spaces at the end of the file name caused the test to fail for Windows only. Bug: 396662 Change-Id: I47bcccb0fa32ce606276c3f30d454851d115ca11 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* | | Merge "Revert "Close unfinished archive entries on error""Dave Borowitz2013-11-012-10/+4
|\ \ \
| * | | Revert "Close unfinished archive entries on error"Jonathan Nieder2013-09-232-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 75d9b31f14d6226a535a80c05cffda29e55d2ceb. Now that we do not try to close the ArchiveOutputStream in the error path, there is no need to artificially close partial entries from before the error. Change-Id: I1f1cb08ec4e9b14c79bf4621f3fa959463034b82 Signed-off-by: Jonathan Nieder <jrn@google.com>
* | | | Enable to prepare interactive rebase and then start it explicitlyTobias Pfeifer2013-11-012-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Operation.PROCESS_STEPS to RebaseCommand to enable starting interactive rebase explicitly after rebase steps have been configured. Change-Id: I2d6f0de82010ea6523fbce6fb4501e847bdcdddc Signed-off-by: Tobias Pfeifer <to.pfeifer@web.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Parse commitId and shortMessage of a commented out line in rebase todoTobias Pfeifer2013-10-312-44/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A rebase todo file consists of regular non-comment action lines and comment lines. In case that a regular action line has been commented out (i.e. prefixed with a hash '#'), the RebaseTodoLine that is representing this line should hold the values for commitId and shortMessage even though it's a comment line. This allows to switch between comment and non-comment easily even after the file has been persisted and reread. Change-Id: I56ec2ba08eaf3772e2d74d937dd496209a744d4b Signed-off-by: Tobias Pfeifer <to.pfeifer@web.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Enhance reading of git-rebase-todo formatted filesChristian Halstrick2013-10-317-289/+663
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reading and writing files formatted like the git-rebase-todo files was hidden in the RebaseCommand. Certain constructs (like leading tabs and spaces) have not been handled as in native git. Also the upcoming rebase interactive feature in EGit needs reading/writing these files independently from a RebaseCommand. Therefore reading and writing those files has been moved to the Repository class. RebaseCommand gets smaller because of that and doesn't have to deal with reading/writing files. Additional tests for empty todo-list files, or files containing comments have been added. Change-Id: I323f3619952fecdf28ddf50139a88e0bea34f5ba Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Also-by: Tobias Pfeifer <to.pfeifer@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Enhance RepositoryTestCase.commitFile() to work on empty repositoryMatthias Sohn2013-10-311-4/+13
| | | | | | | | | | | | | | | Change-Id: Ic64497f0eedf8996ba593ca52dc9a040732a5b24 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge "Add missing resources from source.. in build.properties"Matthias Sohn2013-10-304-4/+8
|\ \ \
| * | | Add missing resources from source.. in build.propertiesTomasz Zarna2013-10-304-4/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: Ief9b84c07494bdb01ce16b4ae3353c5364cc6625 Signed-off-by: Tomasz Zarna <tomasz.zarna@tasktop.com>
* | | | Remove protobuf from target platformMatthias Sohn2013-10-301-2/+0
| |_|/ |/| | | | | | | | Change-Id: Ic160a021c376f02c8a839a766c69a0558f2a361e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Support extension of TransportHttpMichael Nelson2013-10-261-1/+10
|/ / | | | | | | | | | | | | | | | | | | This allows subclasses to configure the HTTP connection (for example, to add headers to the request). Bug: 400724 Change-Id: I6f9d699e158a7b9d813c8fa8d273992a28994e41 Signed-off-by: Michael Nelson <michael.nelson@tasktop.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | CLI fetch command should support --tagsKaloyan Raev2013-10-264-0/+127
| | | | | | | | | | | | | | Bug: 419638 Change-Id: I1dc99fd38e678e091a1d141d741328f0dec1756a Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | Add missing JUnit dependency in MANFEST.MFRüdiger Herrmann2013-10-251-1/+2
| | | | | | | | | | | | Bug: 419998 Change-Id: Ie49ad97cb86d51274251296cee559141bfdb9fc9 Signed-off-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add / fix @since tagsMatthias Sohn2013-10-243-2/+4
| | | | | | | | Change-Id: I1e5bea968b3c79df4f600b75fde5b547ebadde36 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Make sure SystemReader is reset after test is runRobin Stocker2013-10-226-1/+29
| | | | | | | | | | | | | | | | Otherwise the MockSystemReader from the test setup is active for other tests. Change-Id: I7caf693bd692d06936e29efd4dc4aabb48c1c39b Signed-off-by: Robin Stocker <robin@nibor.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-16 01:09:09 +0000