summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
* | Merge "Add describe command to JGit command line interface"Robin Rosenberg2013-10-205-0/+178
|\ \
| * | Add describe command to JGit command line interfaceMatthias Sohn2013-10-115-0/+178
| | | | | | | | | | | | Change-Id: I1560fd2be417361b3d2df15a27618053031bd873 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge "Fix failed tests when the tmp directory is a symlink"Matthias Sohn2013-10-193-16/+24
|\ \ \
| * | | Fix failed tests when the tmp directory is a symlinkRobin Rosenberg2013-10-203-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | On Mac OS X /tmp is by default a symbolic link. Change-Id: I0913ee5ee8db5c5918a9e41abbbfe125b6c70783 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Merge changes I5a5a2387,I04805ce2Robin Rosenberg2013-10-194-17/+25
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | * changes: Describe HEAD if no explicit target was set Allow to set target of DescribeCommand
| * | Describe HEAD if no explicit target was setMatthias Sohn2013-10-114-15/+22
| | | | | | | | | | | | | | | Change-Id: I5a5a238709df813ec07278bb3b4f9ea5c85c0883 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Allow to set target of DescribeCommandMatthias Sohn2013-10-111-2/+3
| | | | | | | | | | | | Change-Id: I04805ce20cc203f5e491406c39b71e7017553b37 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Scripts to publish jgit artifacts on Maven centralMatthias Sohn2013-10-172-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - you need an account on oss.sonatype.org and permissions for group id org.eclipse.jgit, see [1] - install ruby [2] if necessary - run download.rb to download the Maven artifacts from repo.eclipse.org - then run deploy.rb to stage the artifacts on oss.sonatype.org - follow [3] to close the staging repository which triggers some sanity checks on Nexus - ask community to test artifacts from staging repository - if tests are ok release the staging repository as described in [4] [1] https://issues.sonatype.org/browse/OSSRH-2758 [2] https://www.ruby-lang.org/en/downloads/ [3] https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-7b.StageExistingArtifacts [4] https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-8a.ReleaseIt Change-Id: I830f2392b9234e585b01dbb4a5a369edd88796a2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | CLI version command falls back to Bundle-VersionKaloyan Raev2013-10-121-3/+48
|/ / | | | | | | | | | | | | | | | | | | | | If the version command cannot read the Implementation-Version of the containing JAR fall back to read the Bundle-Version header in MANIFEST.MF. This makes the command working also from the org.eclipse.jgit.pgm bundle and during development in a host IDE. Bug: 419087 Change-Id: I4269d1cbd9bf9fd8be6fb4463aecc1c434aa387b Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | List all supported formats in archive command's helpMatthias Sohn2013-10-101-1/+1
| | | | | | | | Change-Id: I4bd271cb348914642069239853488f4960444746 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Add support for --version in JGit CLI"Robin Stocker2013-10-102-1/+10
|\ \
| * | Add support for --version in JGit CLIKaloyan Raev2013-10-092-1/+10
| | | | | | | | | | | | | | | Bug: 419000 Change-Id: I43f5267182ea69d1f9abbff33136e0491c629071 Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>
* | | Add resources/ as source folder in build.propertiesKaloyan Raev2013-10-101-1/+2
|/ / | | | | | | | | | | | | | | | | This allows correct export of org.eclipse.jgit.pgm via the PDE Export wizard. Bug: 419089 Change-Id: I98765208edd7df59e262001dd01ed2b43e4475a9 Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>
* | Fix ServiceMayNotContinueException constructors for Java 1.5Colby Ranger2013-10-081-2/+3
| | | | | | | | | | | | | | | | | | | | IOException did not add a (String, Throwable) constructor until 1.5. Instead use the String super constructor and initCause to initialize the exception. Fixes bug 418889 Change-Id: Ide735ecfc7d04884981b79b57a4275863ce17006
* | Add constructors that take Throwable to ServiceMayNotContinueException.Colby Ranger2013-10-071-0/+23
| | | | | | | | | | | | | | | | | | ServiceMayNotContinueException usually wraps an underlying exception. Add convenience constructors that take Throwable. In the case a string is not provided, the message defaults to "internal server error", since it may be reported to the client. Change-Id: I15dc20306826c352f69e88afb7ed6927c12b6c1f
* | Propagate IOException where possible when getting refs.Colby Ranger2013-10-0716-22/+72
| | | | | | | | | | | | | | | | | | | | Currently, Repository.getAllRefs() and Repository.getTags() silently ignores an IOException and instead returns an empty map. Repository is a public API and as such cannot be changed until the next major revision change. Where possible, update the internal jgit APIs to use the RefDatabase directly, since it propagates the error. Change-Id: I4e4537d8bd0fa772f388262684c5c4ca1929dc4c
* | Prepare 3.2.0-SNAPSHOT buildsMatthias Sohn2013-10-0351-244/+244
| | | | | | | | | | Change-Id: Iac6cf7a5bb6146ee3fe38abe8020fc3fc4217584 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-3.1'Matthias Sohn2013-10-0355-260/+311
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.1: Prepare post 3.1.0 builds JGit v3.1.0.201310021548-r Fix order of commits in rebase todo file header Prepare post 3.1.0 RC1 builds JGit v3.1.0.201309270735-rc1 Attempt to fix graph layout when new heads are introduced Prepare re-signing pgm's ueberjar to avoid SecurityException Use full branch name when getting ref in BranchTrackingStatus Change-Id: Ida30175d0c058048cbe4b563aae7f85cd008db29 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Prepare post 3.1.0 buildsstable-3.1Matthias Sohn2013-10-0351-245/+245
| | | | | | | | | | | | | | | Change-Id: I306a3d40c6ddb88a16d17f09a60e3d19b0716962 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | JGit v3.1.0.201310021548-rv3.1.0.201310021548-rMatthias Sohn2013-10-0251-55/+55
| | | | | | | | | | | | | | | Change-Id: I2170b13047d5eab7565f47f9feb1680e03b1ba09 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Fix order of commits in rebase todo file headerStefan Lay2013-09-291-2/+2
| | | | | | | | | | | | Change-Id: I0e41d89bbd4fc01ad3b3d05a45ee60af853bfae7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Prepare post 3.1.0 RC1 buildsMatthias Sohn2013-09-2751-51/+51
| | | | | | | | | | | | | | | Change-Id: I060f2082ccd0c91905b6b29a49cc633a0b51a1f2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | JGit v3.1.0.201309270735-rc1v3.1.0.201309270735-rc1Matthias Sohn2013-09-2751-51/+51
| | | | | | | | | | | | | | | Change-Id: I48202dd461110da25f9bc159c938311fff0669e0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Attempt to fix graph layout when new heads are introducedRobin Rosenberg2013-09-262-11/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometime the new commit is no allocated onto a new lane leading to the commit being drawn on the wrong branch and something that looks like a merge. The drawback is that this also changes existing valid graphs. Bug: 368927 Change-Id: Ic8a8247c8a53be802c1be83850ed766b902ca646
| * | Prepare re-signing pgm's ueberjar to avoid SecurityExceptionMatthias Sohn2013-09-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we now sign all build artifacts immediately after creating them we need to re-sign the ueberjar created for jgit command line tool because the signatures of the individual jars are invalidated when repacking them into the ueberjar. Hence we need to exclude the signatures of the individual jars when using maven-shade-plugin to create the ueberjar. Also install the shaded plugin into maven repository and exclude osgi framework sources which were included unintentionally. See http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg02277.html Change-Id: Ia302e68a4b2a9399cb18025274574e31d3d3e407 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Use full branch name when getting ref in BranchTrackingStatusRobin Stocker2013-09-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case there is both a tag and branch called "foo", the tag is returned if calling getRef with the short name. By using refs/heads/foo, the branch is returned. Bug: 417158 Change-Id: I86b4f83955586bb24774fd621f5012499cf67909 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge "Added the git-describe implementation"Matthias Sohn2013-10-025-0/+535
|\ \ \ | |_|/ |/| |
| * | Added the git-describe implementationKohsuke Kawaguchi2013-09-275-0/+535
| |/ | | | | | | | | | | | | | | | | | | CQ: 7609 Bug: 339246 Change-Id: I689bc0578ce3a430b9800ad84122e221c69829f4 Signed-off-by: Kohsuke Kawaguchi <kk@kohsuke.org> Also-By: Robin Stocker<robin@nibor.org> Also-By: Matthias Sohn <matthias.sohn@sap.com> Also-By: Christian Halstrick <christian.halstrick@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-24 09:10:53 +0000