summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test
Commit message (Collapse)AuthorAgeFilesLines
* Make sure SystemReader is reset after test is runRobin Stocker2013-10-224-0/+25
| | | | | | | | Otherwise the MockSystemReader from the test setup is active for other tests. Change-Id: I7caf693bd692d06936e29efd4dc4aabb48c1c39b Signed-off-by: Robin Stocker <robin@nibor.org>
* Merge "Fix failed tests when the tmp directory is a symlink"Matthias Sohn2013-10-192-16/+19
|\
| * Fix failed tests when the tmp directory is a symlinkRobin Rosenberg2013-10-202-16/+19
| | | | | | | | | | | | On Mac OS X /tmp is by default a symbolic link. Change-Id: I0913ee5ee8db5c5918a9e41abbbfe125b6c70783 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Describe HEAD if no explicit target was setMatthias Sohn2013-10-111-6/+12
|/ | | | | Change-Id: I5a5a238709df813ec07278bb3b4f9ea5c85c0883 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Prepare 3.2.0-SNAPSHOT buildsMatthias Sohn2013-10-032-37/+37
| | | | | Change-Id: Iac6cf7a5bb6146ee3fe38abe8020fc3fc4217584 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge branch 'stable-3.1'Matthias Sohn2013-10-033-47/+78
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-032-37/+37
| | | | | | | | | | Change-Id: I306a3d40c6ddb88a16d17f09a60e3d19b0716962 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.1.0.201310021548-rv3.1.0.201310021548-rMatthias Sohn2013-10-022-2/+2
| | | | | | | | | | Change-Id: I2170b13047d5eab7565f47f9feb1680e03b1ba09 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.1.0 RC1 buildsMatthias Sohn2013-09-272-2/+2
| | | | | | | | | | Change-Id: I060f2082ccd0c91905b6b29a49cc633a0b51a1f2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.1.0.201309270735-rc1v3.1.0.201309270735-rc1Matthias Sohn2013-09-272-2/+2
| | | | | | | | | | Change-Id: I48202dd461110da25f9bc159c938311fff0669e0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Attempt to fix graph layout when new heads are introducedRobin Rosenberg2013-09-261-10/+41
| | | | | | | | | | | | | | | | | | | | | | 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
* | Added the git-describe implementationKohsuke Kawaguchi2013-09-271-0/+242
|/ | | | | | | | | | 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>
* ResetCommand: Allow reset on unborn branch when ref not specifiedRobin Stocker2013-09-131-1/+37
| | | | | | | | | | | | | In C Git 1.8.2, "git reset" now also works on an unborn branch (no HEAD yet) if no explicit ref was specified. In that case, it is treated as a reset to an empty tree. This can be useful for callers because "unborn branch" no longer has to be special-cased to "git rm --cached". Bug: 414870 Change-Id: Ied750116f767518ae4d48823cf00752b049a8477 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Don't treat "/" as valid ignore patternRobin Stocker2013-09-091-0/+11
| | | | | | | | This matches the behavior of C Git. Bug: 415767 Change-Id: Ifa6500f3f6a033da40c48287630b77c47b15f4a0 Signed-off-by: Robin Stocker <robin@nibor.org>
* Merge branch 'stable-3.0'Matthias Sohn2013-09-041-0/+11
|\ | | | | | | | | | | | | | | | | | | | | | | * stable-3.0: Prepare post 3.0.2-rc2 builds JGit v3.0.2.201309041250-rc2 Uncomment eclipse-jar-signer plugin Update build to use CBI jarsigner plugin Update maven plugins Update to Orbit Kepler SR1 release R20130827064939 Change-Id: Iaa8bba21c300dd1de2b91a77cddf6727fbc66340 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.0.2-rc2 buildsMatthias Sohn2013-09-042-2/+2
| | | | | | | | | | Change-Id: I0e4020326c6443ba7157c18b345160cf9e1e88a7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.2.201309041250-rc2v3.0.2.201309041250-rc2Matthias Sohn2013-09-042-2/+2
| | | | | | | | Change-Id: Ie18ced75f573f140969af2a7d9edb45c76523715 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Update build to use CBI jarsigner pluginMatthias Sohn2013-09-041-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dash signing plugin has been retired hence we need to update our build to use the CBI jarsigner plugin for signing build results. Pack test classes to enable signing them. Also re-enable pack200 for bundle org.eclipse.jgit. WORKAROUND: there is no easy way to run tests with maven-surefire-plugin from signed test-jar so for a quick workaround we will have to add a build step on Hudson so that we can run tests before signing: - first step will do "clean, verify" to compile and run tests - second step will do "install, deploy" with profile "eclipse-sign" and use -DskipTests=true to skip tests since they would hit a SecurityException when unsigned test classes are in same package as signed classes under test - third step will do "clean, install, deploy" on packaging reactor to build features and p2 repository with profile "eclipse-sign" to sign and pack200 all bundles. TODO: Tycho doesn't suport picking up pack200 artifacts via pomDependencies hence we need to find a way to copy them manually and use tycho-extra's tycho-p2-extras-plugin:publish-features-and-bundles to generate the missing p2 metadata. Change-Id: Iec2c5ab3027a3e3f9ecc0d2f99193385177d9025 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Update reflog like C Git during rebase (non-interactive)Robin Rosenberg2013-08-211-2/+90
| | | | | | | | | | | | Bug: 346350 Change-Id: I119766a00bc52a810c51cffaa19207cb8555ca22 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
| * Fix bugs in TreeWalk#isPathSuffix used by PathSuffixFilterRobin Stocker2013-08-211-0/+10
| | | | | | | | | | | | | | | | | | | | | | * It didn't check the first character in the pattern due to a off-by-one error. Spotted by James Roper. * It returned true even when pattern was longer than current path, e.g. it returned that ".txt" is suffix of "txt". Bug: 411999 Change-Id: I9fbcd68a11fb57cc49956b70c387a47271a0424f Signed-off-by: Robin Stocker <robin@nibor.org>
| * Refactor PathSuffixFilterTest to remove duplicationRobin Stocker2013-08-211-61/+31
| | | | | | | | | | | | | | Makes it possible to add new test cases without copying lots of lines. Change-Id: I66db3bc0cbd18fb5a07748905c60384b86b1c162 Signed-off-by: Robin Stocker <robin@nibor.org>
| * Update HEAD in cherry-picking several commitsHiroshi Tomita2013-08-211-0/+36
| | | | | | | | | | | | | | | | | | Without update, index is wrongly detected to be dirty when picking the second commit. Change-Id: Idf47ecb33e8bd38340d760806d629f67be92d2d5 Signed-off-by: Hiroshi Tomita <tomykaira@gmail.com> Bug: 411963
| * Fix HTTP response processing for WWW-Authenticate headersAlex Rukhlin2013-08-211-0/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original code was able to process only one WWW-Authenticate header in an HTTP response, and if this header was not one of two expected, authentication failed regardless of that there could be other headers in the response. All WWW-Authenticate headers in an HTTP response have to be browsed to find one of supported, i.e. Basic or Digest. By that if both are present, the Digest one should be used as more preferable. Bug: 357719 Change-Id: Icf601a41fec63f7d40308f3c85aaa4f71a7c095b Signed-off-by: Alex Rukhlin <arukhlin@microsoft.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Fix tests for OS X when the tmpdir is the default /tmpRobin Rosenberg2013-08-211-2/+7
| | | | | | | | | | | | | | | | | | | | | | /tmp is a symbolic link and some tests break when the path gets canonicalized by JGit or Jetty. Allow Jetty to serve symlinks by setting init parameter "aliases" to true [1]. [1] http://wiki.eclipse.org/Jetty/Howto/How_to_serve_symbolically_linked_files Change-Id: I45359a40435e8a33def6e0bb6784b4d8637793ac Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Recognize CRLF when parsing the short message of a commit or tagRobin Rosenberg2013-08-212-0/+25
| | | | | | | | | | Bug: 400707 Change-Id: I9b09bb88528af465018fc0278f5441f7e6b75986
| * Prepare 3.0.2-SNAPSHOT buildsMatthias Sohn2013-08-192-36/+36
| | | | | | | | | | Change-Id: I3287609a90f068017cc62f4fd7738651e0663081 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Enable LsRemoteCommand to work without local repositoryRobin Stocker2013-08-131-1/+9
| | | | | | | | | | | | | | | | It's supported by C Git and can be useful. Bug: 413388 Change-Id: I12c6c10e791cc09ee271d89eb8b8d32f53e385db Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Recognize CRLF when parsing the short message of a commit or tag"Robin Rosenberg2013-08-102-0/+25
|\ \
| * | Recognize CRLF when parsing the short message of a commit or tagRobin Rosenberg2013-06-142-0/+25
| | | | | | | | | | | | | | | Bug: 400707 Change-Id: I9b09bb88528af465018fc0278f5441f7e6b75986
* | | Merge "Added characters to be escaped in file name patterns"Robin Rosenberg2013-08-101-0/+40
|\ \ \
| * | | Added characters to be escaped in file name patternsGustav Karlsson2013-04-061-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, characters could not be escaped in FileNameMatcher patterns. This breaks file name matching when escaped brackets "\[" and "\]" are used in the pattern. A fix has been implemented to allow for any character to be escaped by prepending it with a '\' Bug: 340715 Change-Id: Ie46fd211931fa09ef3a6a712bd1da3d7fb64c5e3 Signed-off-by: Gustav Karlsson <gustav.karlsson@tieto.com>
* | | | Implement open(URIish) for TransportLocalRobin Stocker2013-07-211-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can be used for listing remote refs for a repository on the file system without having a local repository. Bug: 413400 Change-Id: I397f5092c5eafb62236e9f9e74d9183f56903cc6 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | | Update reflog like C Git during rebase (non-interactive)Robin Rosenberg2013-07-211-2/+90
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 346350 Change-Id: I119766a00bc52a810c51cffaa19207cb8555ca22 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | | Add path option to StatusCommandChristian Halstrick2013-07-211-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow filtering of the status. Only files which match given paths are inspected and only their state is reported. Change-Id: I3c4b1b46bf297cd4ebdb4997cfa14c8752a36411 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | | Fix bugs in TreeWalk#isPathSuffix used by PathSuffixFilterRobin Stocker2013-07-081-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * It didn't check the first character in the pattern due to a off-by-one error. Spotted by James Roper. * It returned true even when pattern was longer than current path, e.g. it returned that ".txt" is suffix of "txt". Bug: 411999 Change-Id: I9fbcd68a11fb57cc49956b70c387a47271a0424f Signed-off-by: Robin Stocker <robin@nibor.org>
* | | | Refactor PathSuffixFilterTest to remove duplicationRobin Stocker2013-07-081-61/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it possible to add new test cases without copying lots of lines. Change-Id: I66db3bc0cbd18fb5a07748905c60384b86b1c162 Signed-off-by: Robin Stocker <robin@nibor.org>
* | | | Merge "Update HEAD in cherry-picking several commits"Robin Stocker2013-07-021-0/+36
|\ \ \ \
| * | | | Update HEAD in cherry-picking several commitsHiroshi Tomita2013-07-011-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without update, index is wrongly detected to be dirty when picking the second commit. Change-Id: Idf47ecb33e8bd38340d760806d629f67be92d2d5 Signed-off-by: Hiroshi Tomita <tomykaira@gmail.com> Bug: 411963
* | | | | Implement get nth offset in PackIndex.Colby Ranger2013-06-281-0/+15
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the offset can only be retrieved by ObjectId or iterating all of the entries. Add a method to lookup the offset by position in the index sorted by SHA1. Change-Id: I45e9ac8b752d1dab47b202753a1dcca7122b958e
* | | | Fix HTTP response processing for WWW-Authenticate headersAlex Rukhlin2013-06-231-0/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original code was able to process only one WWW-Authenticate header in an HTTP response, and if this header was not one of two expected, authentication failed regardless of that there could be other headers in the response. All WWW-Authenticate headers in an HTTP response have to be browsed to find one of supported, i.e. Basic or Digest. By that if both are present, the Digest one should be used as more preferable. Bug: 357719 Change-Id: Icf601a41fec63f7d40308f3c85aaa4f71a7c095b Signed-off-by: Alex Rukhlin <arukhlin@microsoft.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Add a method to DfsOutputStream to read as an InputStreamDave Borowitz2013-06-192-0/+151
| | | | | | | | | | | | | | | | Change-Id: I0ec1f17a88bc14f22c10f9bc8d6f5b5118410e3a
* | | | Fix tests for OS X when the tmpdir is the default /tmpRobin Rosenberg2013-06-161-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /tmp is a symbolic link and some tests break when the path gets canonicalized by JGit or Jetty. Allow Jetty to serve symlinks by setting init parameter "aliases" to true [1]. [1] http://wiki.eclipse.org/Jetty/Howto/How_to_serve_symbolically_linked_files Change-Id: I45359a40435e8a33def6e0bb6784b4d8637793ac Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Disable warning about assigning to parameterRobin Stocker2013-06-151-1/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | See change I08bed4275af9ec52aa4d7054067ac82f6a3c9781, where fixing such warning lead to complaints. If fixing is not wanted, disable it instead. Change-Id: If31d4028fa1c6377a11e83ed5688b45701cec68b
* | | Merge "document empty blocks in StashApplyCommandTest"Matthias Sohn2013-06-141-0/+3
|\ \ \
| * | | document empty blocks in StashApplyCommandTestTomasz Zarna2013-06-131-0/+3
| | | | | | | | | | | | | | | | Change-Id: I5b49bd00b00b86584b912fc5f503abf29db0f56e
* | | | Prepare 3.1.0-SNAPSHOT buildsMatthias Sohn2013-06-132-37/+37
| | | | | | | | | | | | | | | | | | | | Change-Id: I7490a7c9558423c03e3c167ad55b9a98be9d99d9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Merge branch 'stable-3.0'Matthias Sohn2013-06-134-9/+6
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.0: Prepare post 3.0.0.201306101825-r builds JGit v3.0.0.201306101825-r Make JGit test work with both hamcrest 1.1 (juno) and 1.3 (kepler) Fix version.sh to not overwrite ${project.version} Prepare post 3.0.0 RC3 builds JGit v3.0.0.201306040240-rc3 Change-Id: I5b1db1f5b69bad1136dd21b956e798f63b1ba0ee Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Prepare post 3.0.0.201306101825-r buildsMatthias Sohn2013-06-132-2/+2
| | | | | | | | | | | | | | | Change-Id: I299cf1addc0987ffe39140d2216ab6a98e95ce52 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | JGit v3.0.0.201306101825-rv3.0.0.201306101825-rMatthias Sohn2013-06-112-2/+2
| | | | | | | | | | | | | | | Change-Id: Ie8deab94c6263b5198f0bcb4533b1cfb3f5724b1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Make JGit test work with both hamcrest 1.1 (juno) and 1.3 (kepler)Robin Rosenberg2013-06-094-9/+6
| | | | | | | | | | | | | | | | | | | | | The hamcrest library has moved things around. This problem applies only to the test, not plugin runtime. Change-Id: I5b97f356d8595dbdc9e91d157558e40561a6a30d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 19:46:16 +0000