aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Declare internal flag accessors of ObjectToPack finalShawn Pearce2013-04-041-22/+22
| | | | | | | | | | | | | | | | | | None of these methods should ever be overridden at runtime by an extension class. Given how small they are the JIT should perform inlining where reasonable. Hint this is possible by marking all methods final so its clear no replacement can be loaded later on. Change-Id: Ia75a5d36c6bd25b24169e2bdfa360c8f52b669cd
* | Remove unused method isDeltaAttempted()Shawn Pearce2013-04-041-4/+0
| | | | | | | | | | | | | | | | This flag is never checked on its own. It is only checked as part of a pair through the doNotAttemptDelta() method. Delete the method so there is less confusion about the flag being used on its own. Change-Id: Id7088caa649599f4f11d633412c2a2af0fd45dd8
* | Simplify setDoNotDelta() to always set the flagShawn Pearce2013-04-042-9/+6
| | | | | | | | | | | | | | | | This method is only invoked with true as the argument. Remove the unnecessary parameter and branch, making the code easier for the JIT to optimize. Change-Id: I68a9cd82f197b7d00a524ea3354260a0828083c6
* | Add the no-commit option to MergeCommandTomasz Zarna2013-04-049-12/+241
| | | | | | | | | | | | | | | | | | | | Added also tests and the associated option for the command line Merge command. Bug: 335091 Change-Id: Ie321c572284a6f64765a81674089fc408a10d059 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Fix PathFilterGroup not to throw StopWalkException too early"Christian Halstrick2013-04-042-1/+24
|\ \
| * | Fix PathFilterGroup not to throw StopWalkException too earlyRobin Rosenberg2013-04-032-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the Git internal sort order a directory is sorted as if it ended with a '/', this means that the path filter didn't set the last possible matching entry to the correct value. In the reported issue we had the following filters. org.eclipse.jgit.console org.eclipse.jgit As an optimization we throw a StopWalkException when the walked tree passes the last possible filter, which was this: org.eclipse.jgit.console Due to the git sorting order, the tree was processed in this order: org.eclipse.jgit.console org.eclipse.jgit.test org.eclipse.jgit At org.eclipse.jgit.test we threw the StopWalkException preventing the walk from completing successfully. A correct last possible match should be: org.eclipse.jgit/ For simplicit we define it as: org/eclipse/jgit/ This filter would be the maximum if we also had e.g. org and org.eclipse in the filter, but that would require more work so we simply replace all characters lower than '/' by a slash. We believe the possible extra walking does not not warrant the extra analysis. Bug: 362430 Change-Id: I4869019ea57ca07d4dff6bfa8e81725f56596d9f
* | | Merge "Indicate initial commit on a branch in the reflog"Christian Halstrick2013-04-044-12/+9
|\| |
| * | Indicate initial commit on a branch in the reflogRobin Rosenberg2013-04-024-12/+9
| |/ | | | | | | | | Bug: 393463 Change-Id: I4733d6f719bc0dc694e7a6a6ad2092de6364898c
* / Speed up clone/fetch with large number of refsRobin Rosenberg2013-03-303-19/+223
|/ | | | | | | | Instead of re-reading all refs after each update, execute the deletes first, then read all refs once and perform the check for conflicting ref names in memory. Change-Id: I17d0b3ccc27f868c8497607d8e57bf7082e65ba3
* Merge "When renaming the lock file succeeds the lock isn't held anymore"Robin Rosenberg2013-03-281-3/+8
|\
| * When renaming the lock file succeeds the lock isn't held anymoreMatthias Sohn2013-03-261-3/+8
| | | | | | | | | | | | | | | | This wrong book-keeping caused IOExceptions to be thrown because LockFile.unlock() erroneously tried to delete the non-existing lock file. These IOExeptions were hidden since they were silently caught. Change-Id: If42b6192d92c5a2d8f2bf904b16567ef08c32e89 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix CommitCommand amend mode to preserve parent orderShawn Pearce2013-03-281-3/+2
| | | | | | | | Change-Id: I476921ff8dfa6a357932d42ee59340873502b582
* | Fixed parsing of URI with a IPv6-addressAndreas König2013-03-272-2/+2
| | | | | | | | | | | | | | | | Allowed ipv6-address in a uri like: http://[::1]:8080/repo.git Change-Id: Ia00a20f694b2e9314892df77f9b11f551bb1d34e Signed-off-by: Chris Aniszczyk <zx@twitter.com>
* | New functions to facilitate the writing of CLI test casesFrançois Rey2013-03-272-14/+90
| | | | | | | | | | | | | | | | | | | | | | | | Writing CLI test cases is tedious because of all the formatting and escaping subtleties needed when comparing actual output with what's expected. While creating a test case the two new functions are to be used instead of the existing execute() in order to prepare the correct command and expected output and to generate the corresponding test code that can be pasted into the test case function. Change-Id: Ia66dc449d3f6fb861c300fef8b56fba83a56c94c Signed-off-by: Chris Aniszczyk <zx@twitter.com>
* | Merge "File.renameTo behaves differently on Unix and Windows"Matthias Sohn2013-03-271-10/+6
|\ \
| * | File.renameTo behaves differently on Unix and WindowsRobin Rosenberg2013-03-261-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | On Windows renameTo will not overwrite a file, so it must be deleted first. The fix for Bug 402834 did not account for that. Bug: 403685 Change-Id: I3453342c17e064dcb50906a540172978941a10a6
* | | Merge "Extend FileUtils.rename to common git semantics"Matthias Sohn2013-03-272-1/+86
|\| | | |/ |/|
| * Extend FileUtils.rename to common git semanticsRobin Rosenberg2013-03-262-1/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | Unlike the OS or Java rename this method will (on *nix) try (on Windows) replace the target with the source provided the target does not exist, the target does exist and is a file, or if it is a directory which only contains directories. In the latter case the directory hierarchy will be deleted. If the initial rename fails and the target is an existing file the the target file will be deleted first and then the rename is retried. Change-Id: Iae75c49c85445ada7795246a02ce02f7c248d956 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
* | Always add FileExt to DfsPackDescriptionShawn Pearce2013-03-264-0/+8
| | | | | | | | | | | | | | | | | | | | Instead of forcing the implementation of the DFS backend to handle making sure the extension bits are set correctly, have the common callers in JGit set the extension at the same time they supply the file sizes to the pack description. This simplifies assumptions for an implementation of the DFS backend. Change-Id: I55142ad8ea08a3e2e8349f72b3714578eba9c342
* | Merge "Add tests for FileUtils.delete and EMPTY_DIREECTORIES_ONLY"Christian Halstrick2013-03-241-0/+85
|\|
| * Add tests for FileUtils.delete and EMPTY_DIREECTORIES_ONLYRobin Rosenberg2013-03-241-0/+85
| | | | | | | | Change-Id: I54a46c29df5eafc7739a6ef29e5dc80fa2f6d9ba
* | Update build to Tycho 0.17Matthias Sohn2013-03-241-1/+1
|/ | | | Change-Id: I92c9757a37644ec48ed1d785f4dacd6c44276632 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* SimpleHttpServer API shouldn't expose internalsMatthias Sohn2013-03-221-4/+3
| | | | Change-Id: I5963ae720f33cb148de08b4c64d02c81d6791139 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Grant access to jgit internals to junit and http.server bundlesMatthias Sohn2013-03-221-1/+2
| | | | Change-Id: Ib34f9635b4d060f5d17a6c823ec91af1d934a180 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add missing @since tagsMatthias Sohn2013-03-2210-4/+25
| | | | Change-Id: I6b20d78e6bd1f245fdca331554c106f8bae44b9c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix @since tags in JGit, version 2.4 never existedTomasz Zarna2013-03-2119-9/+51
| | | | Change-Id: Iaca88ec28b412e6b58e7b39a0762ba54b25f9471 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge changes If98b0b97,I7c9c09b4Shawn Pearce2013-03-215-27/+47
|\ | | | | | | | | | | * changes: Add convenience factory method for most used builder pattern Don't use internal type FileRepository in public API
| * Add convenience factory method for most used builder patternMatthias Sohn2013-03-201-0/+15
| | | | | | | | | | | | | | | | This will simplify to adapt EGit to the removal of FileRepository from jgit's public API in change I2ab1327c202ef2003565e1b0770a583970e432e9. Change-Id: If98b0b97e8f13a94d4ea7ba1be0f90d82b0fba4b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Don't use internal type FileRepository in public APIMatthias Sohn2013-03-205-27/+32
| | | | | | | | | | Change-Id: I7c9c09b4f190fa7cb830563bcdf2071407ee2ce0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Allow users to show server messages while pushingAndré Dietisheim2013-03-2113-27/+300
| | | | | | | | | | | | | | | | | | | | | | | | Allow users to provide their OutputStream (via Transport# push(monitor, refUpdates, out)) so that server messages can be written to it (in SideBandInputStream) while they're coming in. CQ: 7065 Bug: 398404 Change-Id: I670782784b38702d52bca98203909aca0496d1c0 Signed-off-by: Andre Dietisheim <andre.dietisheim@gmail.com> Signed-off-by: Chris Aniszczyk <zx@twitter.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Don't verify host name when sslVerify is falseMatthias Sohn2013-03-191-0/+11
| | | | | | | | | | | | | | | | Native git also doesn't verify host names when http.sslVerify=false. See native git's commit a5ccc597. See: http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg02047.html Change-Id: I42f509fea8e4ac89fad646aec3dfbf1753ae7e3d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix line endings and whitespace errors in jgit featureMatthias Sohn2013-03-203-27/+27
| | | | | | | | | | Change-Id: I9fc69fccedf362453f74f1e09d2b50ac705a9cac Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix formatting of PackConfig.toString() & GC.RepoStatistics.toString()Edwin Kempin2013-03-202-13/+13
| | | | | | | | | | Change-Id: I7e0c74ecfd0e0615d10fb582b2897d33be23440a Signed-off-by: Edwin Kempin <edwin.kempin@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Allow to get repo statistics from GarbageCollectionCommand before gcEdwin Kempin2013-03-203-0/+20
|/ | | | | | | | | | | | | | | | | When running the garbage collection for a repository it is often interesting to compare the repository statistics from before and after the garbage collection to understand the effect of the garbage collection. This is why it makes sense that the GarbageCollectionCommand provides a method to retrieve the repository statistics before running the garbage collection. So far without running the garbage collection the repository statistics can only be retrieved by using JGit internal classes. This is what EGit and Gerrit do at the moment, but it would be better to have an API for this. Change-Id: Id7e579157e9fbef5cfd1fc9f97ada45f0ca8c379 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge "Fix GC for FileRepo in case packfile renames fail"Matthias Sohn2013-03-193-3/+55
|\
| * Fix GC for FileRepo in case packfile renames failChristian Halstrick2013-03-193-3/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only on Windows the rename operation which renames temporary Packfiles (and index-files and bitmap-files) sometime fails. This happens only when renaming a temporary Packfile to a Packfile which already exists. Such situations occur if you run GC twice on a repo without modifying the repo inbetween. In such situations there was bug in GC which led to a corrupted repo whithout any packfiles anymore. This commit fixes the problem by introducing a utility method which renames a file and throws an IOException if it fails. This method also takes care to repeat a failing rename if our FS class has found out we are running on a platform with a unreliable File.renameTo() method. I am searching for a better solution because even with this utility method in hand a GC on a already GC'ed repo will fail on Windows. But at least with this fix we will not produce corrupted repos anymore. Bug: 389305 Change-Id: Iac1ab3e0b8c419c90404f2e2f3559672eb8f6d28 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix location of DfsText.propertiesShawn Pearce2013-03-191-0/+0
|/ | | | | | The file was not moved when the package was renamed to internal. Change-Id: I29a078d6316daa4e4407db9ecedc8b7ed05535cd
* Make GC more robust against corrupt reflogsChristian Halstrick2013-03-192-6/+24
| | | | | | | | | | | With JGit it is possible to write reflog entries where new objectid and old objectid is null. Such reflogs cause FileRepository GC to crash because it doesn't expect the new objectid to be null. One case where this happened is in Gerrit's allProjects repo. In the same way as we expect the old objectid to be potentially null we should also ignore null values in the new objectid column. Change-Id: Icf666c7ef803179b84306ca8deb602369b8df16e
* JGit 3.0: move internal classes into an internal subpackageShawn Pearce2013-03-18255-664/+717
| | | | | | | | This breaks all existing callers once. Applications are not supposed to build against the internal storage API unless they can accept API churn and make necessary updates as versions change. Change-Id: I2ab1327c202ef2003565e1b0770a583970e432e9
* Merge changes I2645d482,Ic81fefb1,Id64ab38dShawn Pearce2013-03-1813-326/+22
|\ | | | | | | | | | | | | * changes: Remove cached_packs support in favor of bitmaps Remove objects before optimization from DfsGarbageCollector Simplfy caching of DfsPackDescription from PackWriter.Statistics
| * Remove cached_packs support in favor of bitmapsShawn Pearce2013-03-1412-299/+5
| | | | | | | | | | | | | | | | | | | | The bitmap code in PackWriter knows exactly when to use a pack as a "cached pack". It enables cached pack usage only when the pack has a bitmap and its entire closure of objects needs to be sent. This is a much simpler code path to maintain, and JGit actually has a way to write the necessary index. Change-Id: I2645d482f8733fdf0c4120cc59ba9aa4d4ba6881
| * Remove objects before optimization from DfsGarbageCollectorShawn Pearce2013-03-141-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | Just counting objects is not sufficient. There are some race conditions with receive packs and delta base completion that may confuse such a simple algorithm. Instead always do the larger set computations, and rely on the PackWriter having no objects pending as the way to avoid creating an empty pack file. Change-Id: Ic81fefb158ed6ef8d6522062f2be0338a49f6bc4
| * Simplfy caching of DfsPackDescription from PackWriter.StatisticsShawn Pearce2013-03-143-9/+10
| | | | | | | | | | | | | | | | | | | | | | Let the pack description copy the relevant stats values. This moves it out of the garbage collector and compactor algorithms, co-locating with something that might care. Remove some unnecessary code from the DfsPackCompactor, the stats tracks the same information and can supply it. Change-Id: Id64ab38d507c0ed19ae0d106862d175b7364eba3
* | Use RawParseUtils.prevLF in RebaseCommandRobin Stocker2013-03-161-4/+2
| | | | | | | | | | | | | | | | As noticed by Robin Rosenberg in review of I4eb87c850078ca187b38b81cc91c92afb1176945. Change-Id: If96d66b6c025ad8f2f47829c933f3c65ab6cbeef Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Support aborting non-interactive rebase started from C GitRobin Stocker2013-03-162-54/+120
| | | | | | | | | | | | | | | | | | Continuing is trickier, as .git/rebase-apply contains no message file and no git-rebase-todo. Bug: 336820 Change-Id: I4eb87c850078ca187b38b81cc91c92afb1176945 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | NameRevCommand: Don't use merge cost for first parentDave Borowitz2013-03-152-18/+22
| | | | | | | | | | | | | | | | Treat first parent traversals as 1 and higher parents as MERGE_COST, to match git name-rev. Allow overriding the merge cost during tests to avoid creating 2^16 commits on the fly. Change-Id: I0175e0c3ab1abe6722e4241abe2f106d1fe92a69
* | Merge "A folder does not constitute a dirty work tree"Robin Rosenberg2013-03-153-2/+83
|\ \
| * | A folder does not constitute a dirty work treeRobin Rosenberg2013-03-103-2/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes two cases: - A folder without tracked content exist both in the workdir and merged commit, as long as there names within that folder does not conflict. - An empty folder structure exists with the same name as a file in the merged commit. Bug: 402834 Change-Id: I4c5b9f11313dd1665fcbdae2d0755fdb64deb3ef
* | | Merge "Add toString() for PackConfig"Christian Halstrick2013-03-151-0/+18
|\ \ \
| * | | Add toString() for PackConfigEdwin Kempin2013-03-151-0/+18
| | |/ | |/| | | | | | | | | | | | | | | | This is helpful for writing the pack configuration into a log file. Change-Id: I5e7f5ff7e01c9538ca12a1860844ba9b467bdf05 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-19 12:23:21 +0000