aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Update HEAD in cherry-picking several commits"Robin Stocker2013-07-022-5/+40
|\
| * Update HEAD in cherry-picking several commitsHiroshi Tomita2013-07-012-5/+40
| | | | | | | | | | | | | | | | | | 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
* | Use a bucket sort for PackReverseIndex.Colby Ranger2013-07-011-86/+87
| | | | | | | | | | | | | | | | | | | | | | | | Previously it took 1200ms to create a reverse index (sorted by offset). Using a simple bucket sort algorithm, that time is reduced to 450ms. The bucket index into the offset array is kept, in order to decrease the binary search window. Don't keep a copy of the offsets. Instead, use nth position to lookup the offset in the PackIndex. Change-Id: If51ab76752622e04a4430d9a14db95ad02f5329d
* | Implement get nth offset in PackIndex.Colby Ranger2013-06-284-12/+73
|/ | | | | | | | 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
* Merge "Add missing @since tag"Matthias Sohn2013-06-261-0/+1
|\
| * Add missing @since tagMatthias Sohn2013-06-201-0/+1
| | | | | | | | Change-Id: I80cfc3e81d5cebf810f36ddf2760aee955c6f50a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Move gc to package org.eclipse.jgit.pgm"Christian Halstrick2013-06-242-3/+2
|\ \
| * | Move gc to package org.eclipse.jgit.pgmMatthias Sohn2013-06-222-3/+2
| |/ | | | | | | | | | | | | All bugs reported for gc have been fixed and it seems we reached a stable implementation. Change-Id: I78a96ee2103beb48325da0f6ee10b2498bdc0267 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix HTTP response processing for WWW-Authenticate headersAlex Rukhlin2013-06-232-17/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Don't skip want validation when the client sends no havesDave Borowitz2013-06-211-2/+2
|/ | | | Change-Id: I5e80b3befca5cf1dcb06075862d6d48e6491cc0f
* Remove fix-headers and rewrite-historyShawn Pearce2013-06-193-438/+0
| | | | | | | | | | These scripts were created to bootstrap the initial contribution for Eclipse using information from the pre-Eclipse history. We are well past the point where the project will rewrite history in order to correct copyright statements, so these tools no longer make sense to keep in the tip of the tree. Change-Id: If68419ead0766035d17a21a53a3e5e761eaa70c4
* Add a method to DfsOutputStream to read as an InputStreamDave Borowitz2013-06-195-39/+296
| | | | Change-Id: I0ec1f17a88bc14f22c10f9bc8d6f5b5118410e3a
* Add the other test launchers as favoritesRobin Rosenberg2013-06-163-0/+12
| | | | | | | The user may not see them otherwise Change-Id: I43b7c0172870a9446cfb35c7b3fee6394f3292e3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix tests for OS X when the tmpdir is the default /tmpRobin Rosenberg2013-06-164-5/+18
| | | | | | | | | | | /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>
* Fix running maven http tests on OS XRobin Rosenberg2013-06-161-0/+8
| | | | | | | | In 36144e12d8 tests were changed to use the system tmp directory as defined by java.io.tmpdir, which was then overridden in the pom files to usea custom directory that made som tests work, but not all. Change-Id: I2fa04878f8830ad9c9b32a6f3fe8d2e2d66fe411
* Disable warning about assigning to parameterRobin Stocker2013-06-1515-15/+15
| | | | | | | | | See change I08bed4275af9ec52aa4d7054067ac82f6a3c9781, where fixing such warning lead to complaints. If fixing is not wanted, disable it instead. Change-Id: If31d4028fa1c6377a11e83ed5688b45701cec68b
* Add missing @since tagsMatthias Sohn2013-06-153-8/+13
| | | | Change-Id: I7f2c155cab4b5be55f7e849ff2595c8c5d804f05 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* 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-1351-242/+242
| | | | | | | | | | Change-Id: I7490a7c9558423c03e3c167ad55b9a98be9d99d9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-3.0'Matthias Sohn2013-06-139-23/+27
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | * 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-1346-46/+46
| | | | | | | | | | Change-Id: I299cf1addc0987ffe39140d2216ab6a98e95ce52 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.0.201306101825-rv3.0.0.201306101825-rMatthias Sohn2013-06-1146-46/+46
| | | | | | | | | | 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>
| * Fix version.sh to not overwrite ${project.version}Matthias Sohn2013-06-041-3/+10
| | | | | | | | | | Change-Id: If5ae792581170bcba2dc1860012cbe389d8e9f24 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.0.0 RC3 buildsMatthias Sohn2013-06-0446-46/+46
| | | | | | | | | | Change-Id: I008d55e2ef0aac9d1877b05ba73e3cf26335d430 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.0.201306040240-rc3v3.0.0.201306040240-rc3Matthias Sohn2013-06-0446-58/+58
| | | | | | | | | | Change-Id: I8b782e9ebe03e5f72611a21a76d80c6b20cb7845 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix warnings in ArchiveCommandMatthias Sohn2013-06-101-11/+7
| | | | | | | | | | | | | | | | | | - remove unnecessary imports - fix NLS warnings - add missing Javadoc tag Bug: 410354 Change-Id: I2b78a2c0e92c740bed80558b17a2100c1c884416 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add support for "jgit archive --output=<filename>"Jonathan Nieder2013-06-062-12/+235
| | | | | | | | | | | | | | | | | | | | If the --format option is not given and the output filename is, then infer the format from that filename. Otherwise match "git archive" by defaulting to tar (this is a change from the existing "jgit archive" default behavior, which was to default to zip). Change-Id: I5806bc48a403d05e4cfc3c180b82b33ad7cfae7f
* | Pick default archive format based on filename suffixJonathan Nieder2013-06-066-3/+111
| | | | | | | | | | | | | | | | | | | | | | | | Introduce a setFilename() method for ArchiveCommand so callers can specify the intended filename of the produced archive. If the filename ends with .tar, the format will default to tar; if .zip, zip; if .tar.gz, gzip-compressed tar; and so on. This doesn't affect "jgit archive" because it doesn't support the --output=<file> option yet. A later patch might do that. Change-Id: Ic0236a70f7aa7f2271c3ef11083b21ee986b4df5
* | Add long filename, large file, and non-ASCII filename support to TarFormatJonathan Nieder2013-06-063-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempts to write entries with too-long filenames currently error out: $ jgit.pgm/target/jgit archive HEAD >test.tar java.lang.RuntimeException: file name 'org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultReceivePackFactory.java' is too long ( > 100 bytes) at org.apache.commons.compress.archivers.tar.TarArchiveOutputStream.putArchiveEntry(TarArchiveOutputStream.java:288) at org.eclipse.jgit.archive.TarFormat.putEntry(TarFormat.java:92) at org.eclipse.jgit.archive.TarFormat.putEntry(TarFormat.java:62) at org.eclipse.jgit.api.ArchiveCommand.writeArchive(ArchiveCommand.java:293) at org.eclipse.jgit.api.ArchiveCommand.call(ArchiveCommand.java:322) at org.eclipse.jgit.pgm.Archive.run(Archive.java:97) at org.eclipse.jgit.pgm.TextBuiltin.execute(TextBuiltin.java:174) at org.eclipse.jgit.pgm.Main.execute(Main.java:213) at org.eclipse.jgit.pgm.Main.run(Main.java:121) at org.eclipse.jgit.pgm.Main.main(Main.java:95) That's because the default longFileMode is LONGFILE_ERROR, which throws an exception for filenames longer than 100 characters. Switch to LONGFILE_POSIX. While at it, handle large files and filenames with strange encodings, too. This requires commons compress 1.4, which introduced support for large files and POSIX long filenames. Change-Id: I04d5427eec0968b129f55d7a4c6021039a494828
* | Add tbz2 archive formatJonathan Nieder2013-06-053-0/+73
| | | | | | | | Change-Id: Idb7ff75877a0cfe23f47e10e3f6f93386f5bb145
* | Include o.e.j.archive into o.e.jgit featureMatthias Sohn2013-06-022-14/+18
| | | | | | | | | | | | | | Also the pgm feature should depend on the jgit feature to ensure that all needed bundles are available. Change-Id: I670e8262cdace4323d3883717efe4b5e5e06f4c7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Update build to use Tycho 0.18Matthias Sohn2013-06-021-1/+1
| | | | | | | | | | Change-Id: I66ffb2b6416dbbd5da11ad789dd58060b7ab09f2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add jgit target platform to define dependencies more preciselyMatthias Sohn2013-06-027-24/+172
| | | | | | | | | | | | | | | | | | Avoid that the packaging build picks an older jgit version coming with eclipse platform by using a target platform which allows to define the dependencies more precisely. Change-Id: I39bba3baa4517e2b5e5fe0de096e756f2904e3e9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix javadoc of FormatActivatorMatthias Sohn2013-06-021-5/+7
| | | | | | | | | | Change-Id: I64b32f71df2964da4cb2de73b34bf7e455ab5b93 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix version of dependency to package org.osgi.frameworkMatthias Sohn2013-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | OSGi 4.01 comes with package org.osgi.framework version 1.3 [1] which has the BundleActivator interface needed by org.eclipse.jgit.archive. OSGi 5.0 matches package org.osgi.framework version 1.7 [2]. [1] http://www.osgi.org/javadoc/r4v401/ [2] http://www.osgi.org/javadoc/r5/core/ Change-Id: I10f78e5eb02b5d03395f23d2f0ad039caf565269 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add missing javadoc for archive codeJonathan Nieder2013-05-297-0/+63
| | | | | | | | | | | | | | | | Document archive formats, the archive format interface, and the parameters of the GitAPIException constructors. Noticed by eclipse. Reported-by: Dani Megert <Daniel_Megert@ch.ibm.com> Change-Id: I22b5f9d4c0358bbe867c1906feec7c279e214273
* | Remove unused import in ArchiveJonathan Nieder2013-05-291-1/+0
| | | | | | | | Change-Id: I0bc82e74f4acedb059322c29e13352151165ef7f
* | Drop unnecessary "throws" clauses in archive codeJonathan Nieder2013-05-292-4/+3
| | | | | | | | | | | | Noticed by eclipse. Change-Id: I730b290556066038efeaf2436de95415b175f351
* | Move FormatActivator.start()/stop() to a separate classJonathan Nieder2013-05-293-46/+95
| | | | | | | | | | | | | | | | | | This makes the functionality of registering all formats from the org.eclipse.jgit.archive package available in contexts where FormatActivator cannot be built because the OSGi core framework is not readily available to build against. Change-Id: If8e3487e933783a7e12f8e1838cbfe0b5862ce80
* | Merge branch 'stable-3.0'Matthias Sohn2013-05-2925-138/+566
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.0: Prepare post 3.0.0-rc2 builds JGit v3.0.0.201305281830-rc2 Support refspecs with wildcard in middle (not only at end) Fix multiple bugs in RawSubStringPattern used by MessageRevFilter Handle short branch/tag name for setBranch in CloneCommand Add missing Bundle-Localization header Apply tree filter marks when pairing DiffEntry for renames Improve feature names to become understandable by end users Update kepler orbit version to R20130517111416 Fix BatchRefUpdate progress-monitoring so it doesn't count twice Fix AnyObjectId's generic type declaration of Comparable Fix DiffFormatter NPEs for DiffEntry without content change Fix CommitCommand not to destroy repo Fix the parameters to an exception Prepare post 3.0.0 M7 builds JGit v3.0.0.201305080800-m7 Change-Id: Ia8441c9796f01497e0d90e672c0aaf60520a0098 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.0.0-rc2 buildsMatthias Sohn2013-05-2946-58/+58
| | | | | | | | Change-Id: Ic46832bcde80d0bf74c16cb094abd76b00552d14 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.0.201305281830-rc2v3.0.0.201305281830-rc2Matthias Sohn2013-05-2946-58/+58
| | | | | | | | | | Change-Id: I490ad8cc7590f70783d3fbd6dd6f0e0446ae5afe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Support refspecs with wildcard in middle (not only at end)Robin Stocker2013-05-284-19/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following refspec, which can be used to fetch GitHub pull requests, is supported by C Git but was not yet by JGit: +refs/pull/*/head:refs/remotes/origin/pr/* The reason is that the wildcard in the source is in the middle. This change also includes more validation (e.g. "refs//heads" is not valid) and test cases. Bug: 405099 Change-Id: I9bcef7785a0762ed0a98ca95a0bdf8879d5702aa
| * Fix multiple bugs in RawSubStringPattern used by MessageRevFilterRobin Stocker2013-05-282-5/+109
| | | | | | | | | | | | | | | | | | | | * Match at end of input was not handled correctly. * When more than one character matched but not all, the next character was not considered as a match start (e.g. pattern "abab" didn't match input "abaabab"). Bug: 409144 Change-Id: Ia44682c618bfbb927f5567c194227421d222a160 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Handle short branch/tag name for setBranch in CloneCommandRobin Stocker2013-05-262-10/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, it was not clear from the documentation what kind of branch name was accepted. Users specifying "branch" (instead of "refs/heads/branch") got no error message and ended up with a repository without HEAD and no checkout. With this, CloneCommand now tries "$branch", then "refs/heads/$branch" and then "refs/tags/$branch". C Git only does the last two, but for compatibility we should still allow "refs/heads/branch". Bug: 390994 Change-Id: I4be13144f2a21a6583e0942f0c7c40da32f2247a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Add missing Bundle-Localization headerMatthias Sohn2013-05-261-0/+1
| | | | | | | | Change-Id: I6831ad417f069127b4705fdd909844ec72065527 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Apply tree filter marks when pairing DiffEntry for renamesRobin Stocker2013-05-241-0/+2
| | | | | | | | | | | | | | | | | | | | When using a RenameDetector to generate new DiffEntries after using DiffEntry.scan, the treeFilterMarks of the original entries were lost. Now it combines the marks from src and dst. See EGit bug 335082 where this is used. Change-Id: I72b34b10ca12e3a6bd10ce44f4fa05b193fc52cc
| * Improve feature names to become understandable by end usersMatthias Sohn2013-05-216-6/+6
| | | | | | | | | | | | | | | | | | This was requested in [1]. [1] http://dev.eclipse.org/mhonarc/lists/cross-project-issues-dev/msg08981.html Change-Id: I9764961a651c1fa64042098d60da9b496453f703 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 02:27:11 +0000