aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable-4.2'Matthias Sohn2016-02-1021-740/+846
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.2: RepoProject: Fix warnings about variable hiding RepoTest: Open Git in try-with-resources RepositoryResolveTest: Open Git in try-with-resource RepositoryTestCase: Open autocloseable types in try-with-resource ResetCommandTest: Use Git member in testHardResetAfterSquashMerge ResolveMergerTest: Open Git in try-with-resource RevCommitListTest: Open Git and RevWalk in try-with-resource RevCommitParseTest: Open ObjectInserter.Formatter in try-with-resource RevObjectTest: Open RevWalk in try-with-resource RevTagParseTest: Open ObjectInserter.Formatter in try-with-resource RevertCommandTest: Open Git in try-with-resource SquashMessageFormatterTest: Open git in try-with-resource StatusCommandTest: Open Git in try-with-resource SubmoduleAddTest: Open Git in try-with-resource SymlinksTest: Open git and TreeWalk in try-with-resource T0003_BasicTest: Open autocloseable types in try-with-resource TextHashFunctions: Fix warnings about variable hiding TreeFilterTest: Open TreeWalk in try-with-resource TreeWalkJava7Test: Open TreeWalk in try-with-resource Fix diff for added and removed submodule Change-Id: If3ecc63f6dfac55474d3c1dd2f4105371f3d24fb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Merge branch 'stable-4.1' into stable-4.2Matthias Sohn2016-02-102-0/+65
| |\ | | | | | | | | | | | | | | | | | | | | | * stable-4.1: Fix diff for added and removed submodule Change-Id: I37dd71ed19b06e9bbcffe37370081ab875c6d8d4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * Fix diff for added and removed submoduleHugo Arès2016-02-042-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since If13f7b406, submodule difference are shown as a hunk. The issue was that added and removed submodule were considered as Edit.REPLACE instead of Edit.INSERT and Edit.DELETE in the DiffFormatter result. Change-Id: I4330c2aa3f10e29d7d6b0b2e5286e59293a06239 Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
| * | RepoProject: Fix warnings about variable hidingDavid Pursehouse2016-02-051-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Method parameter names were hiding class members of the same name. Change-Id: I182f2715894ac4259b09a371cb4e0eb24f52518a Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | RepoTest: Open Git in try-with-resourcesDavid Pursehouse2016-02-051-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | Allocate a new Git for each part of the test, rather than reassigning to the same variable. Change-Id: Ic83778bbff0b2f57d37b95aef70324859d42cd58 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | RepositoryResolveTest: Open Git in try-with-resourceDavid Pursehouse2016-02-051-25/+27
| | | | | | | | | | | | | | | Change-Id: Ibb612f3d8fd0f9913291430474311d9da62f4e6f Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | RepositoryTestCase: Open autocloseable types in try-with-resourceDavid Pursehouse2016-02-051-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | ObjectInserter.Formatter and Git are autocloseable and can be opened in try-with-resource to prevent a resource leak warning. Change-Id: I48c4001aaa7d9c1e36369e9799bfbb7c3bb46d8b Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | ResetCommandTest: Use Git member in testHardResetAfterSquashMergeDavid Pursehouse2016-02-051-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the class member instance of the Git rather than creating a new one in the test. This makes it consistent with the other tests in the module. Change-Id: Ibe822ded76a80b94922e92bbc6f5d90bcc52f8a3 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | ResolveMergerTest: Open Git in try-with-resourceDavid Pursehouse2016-02-051-29/+30
| | | | | | | | | | | | | | | Change-Id: Ic378ec25c4a3ea4354ee643029f87e46b6449ed4 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | RevCommitListTest: Open Git and RevWalk in try-with-resourceDavid Pursehouse2016-02-051-17/+19
| | | | | | | | | | | | | | | Change-Id: I4ba273a364a12f82a3b3b06ba050bc633411daf6 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | RevCommitParseTest: Open ObjectInserter.Formatter in try-with-resourceDavid Pursehouse2016-02-051-2/+3
| | | | | | | | | | | | | | | Change-Id: Iaa87c51bc19b4fa832393c11db20b69865d30d48 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | RevObjectTest: Open RevWalk in try-with-resourceDavid Pursehouse2016-02-051-3/+6
| | | | | | | | | | | | | | | Change-Id: I19bcbb2f12036c5043436f3d544ccefbb7385b8d Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | RevTagParseTest: Open ObjectInserter.Formatter in try-with-resourceDavid Pursehouse2016-02-051-3/+4
| | | | | | | | | | | | | | | Change-Id: I2341977223be1dc5252492f4775626122f56496b Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | RevertCommandTest: Open Git in try-with-resourceDavid Pursehouse2016-02-051-237/+243
| | | | | | | | | | | | | | | Change-Id: I659adbb0a6f741c4c6f615c8a24b4603c3f6681e Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | SquashMessageFormatterTest: Open git in try-with-resourceDavid Pursehouse2016-02-051-11/+12
| | | | | | | | | | | | | | | Change-Id: Ife94d1f0279ed3671a9bca79fb26c0403549fa17 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | StatusCommandTest: Open Git in try-with-resourceDavid Pursehouse2016-02-051-94/+96
| | | | | | | | | | | | | | | Change-Id: Id13ad9fa3157d0479da12fb8184437be3ca8c948 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | SubmoduleAddTest: Open Git in try-with-resourceDavid Pursehouse2016-02-051-87/+91
| | | | | | | | | | | | | | | Change-Id: I1276ce206e891729adfa681e00952ca0ba6ffc53 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | SymlinksTest: Open git and TreeWalk in try-with-resourceDavid Pursehouse2016-02-051-164/+173
| | | | | | | | | | | | | | | Change-Id: I0fd1933e843375029fa795447b688f23a893f84b Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | T0003_BasicTest: Open autocloseable types in try-with-resourceDavid Pursehouse2016-02-051-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileRepository and ObjectInserter.Formatter are autocloseable, so use try-with-resource for these. Remove suppression of unused variable warning that is no longer necessary. Change-Id: I270829f0a4030083c9599eb5785b0145dc590ed8 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | TextHashFunctions: Fix warnings about variable hidingDavid Pursehouse2016-02-051-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | The local variables/arguments named 'db' were hiding the member variable of the same name in the superclass TextBuiltin. Change-Id: Ic49dcb7cc2a1b3fb46ad78450042c8c8fb464a80 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | TreeFilterTest: Open TreeWalk in try-with-resourceDavid Pursehouse2016-02-051-9/+12
| | | | | | | | | | | | | | | Change-Id: If100a66e544926bcffe9a9a0b31bfd4806902864 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | TreeWalkJava7Test: Open TreeWalk in try-with-resourceDavid Pursehouse2016-02-051-8/+9
| | | | | | | | | | | | | | | Change-Id: I99a483c482b5395653b0d57b368ec1b5fdba450c Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | Add support for HEAD requests to HttpClientConnectionMatthias Sohn2016-02-041-4/+12
| | | | | | | | | | | | | | | Change-Id: I501f37e06b686a3a0bb5fd857dd72e424da91d3e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Allow to reuse disableSslVerify method, move it to HttpSupportSaša Živkov2016-02-042-43/+61
| | | | | | | | | | | | | | | | | | | | | The disableSslVerify method will be used in the follow up change. Change-Id: Ie00b5e14244a9a036cbdef94768007f1c25aa8d3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Support LFS protocol and a file system based LFS storageMatthias Sohn2016-02-0466-7/+4201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement LfsProtocolServlet handling the "Git LFS v1 Batch API" protocol [1]. Add a simple file system based LFS content store and the debug-lfs-store command to simplify testing. Introduce a LargeFileRepository interface to enable additional storage implementation while reusing the same protocol implementation. At the client side we have to configure the lfs.url, specify that we use the batch API and we don't use authentication: [lfs] url = http://host:port/lfs batch = true [lfs "http://host:port/lfs"] access = none the git-lfs client appends the "objects/batch" to the lfs.url. Hard code an Authorization header in the FileLfsRepository.getAction because then git-lfs client will skip asking for credentials. It will just forward the Authorization header from the response to the download/upload request. The FileLfsServlet supports file content storage for "Large File Storage" (LFS) server as defined by the Github LFS API [2]. - upload and download of large files is probably network bound hence use an asynchronous servlet for good scalability - simple object storage in file system with 2 level fan-out - use LockFile to protect writing large objects against multiple concurrent uploads of the same object - to prevent corrupt uploads the uploaded file is rejected if its hash doesn't match id given in URL The debug-lfs-store command is used to run the LfsProtocolServlet and, optionally, the FileLfsServlet which makes it easier to setup a local test server. [1] https://github.com/github/git-lfs/blob/master/docs/api/http-v1-batch.md [2] https://github.com/github/git-lfs/tree/master/docs/api Bug: 472961 Change-Id: I7378da5575159d2195138d799704880c5c82d5f3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
* | | Add com.google.gson 2.2.4.v201311231704 to target platformMatthias Sohn2016-02-046-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | We will use gson to implement the LFS REST API. CQ: 9966 Change-Id: I7feb6b2b8f7b736888370aad94e4c436ae6014bb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Implement SHA-256 abstractionMatthias Sohn2016-02-0466-3/+5336
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Large File Storage extension specified by GitHub [1] uses SHA-256 to compute the ID of large files stored by the extension. Hence implement a SHA-256 abstraction similar to the SHA-1 abstraction used by JGit. [1] https://git-lfs.github.com/ Bug: 470333 Change-Id: I3a95954543c8570d73929e55f4a884b55dbf1b7a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Remove unused API problem filtersMatthias Sohn2016-02-031-116/+0
| | | | | | | | | | | | Change-Id: I8b1c99b108b4cea6356e0a62e6bfc0731df44cf5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge branch 'stable-4.2'Matthias Sohn2016-02-035-240/+247
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.2: DirCacheCheckoutTest: Open Git and TreeWalk in try-with-resource CommitCommand: Remove declaration of unthrown exception Branch: Fix variable hiding warning ApplyCommandTest: Open Git in try-with-resource PackFileTest: Open ObjectInserter.Formatter in try-with-resource Change-Id: I8484b10fad5a4c35fcfaedc1cdf8ccf97471618e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | DirCacheCheckoutTest: Open Git and TreeWalk in try-with-resourceDavid Pursehouse2016-02-021-106/+109
| | | | | | | | | | | | | | | Change-Id: Icc8eda841e6a437e1acf3438525014e7c46d5eb2 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | CommitCommand: Remove declaration of unthrown exceptionDavid Pursehouse2016-02-021-1/+1
| | | | | | | | | | | | | | | Change-Id: I1795b1e510ab170f062ee6c5988d7a7567abe260 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | Branch: Fix variable hiding warningDavid Pursehouse2016-02-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | The Branch class has a member named 'branch', which was being hidden by the local variable of the same name used in a for-loop. Change-Id: I334092010a9c80686fb79713852d4bfa166ce12f Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | ApplyCommandTest: Open Git in try-with-resourceDavid Pursehouse2016-02-021-16/+17
| | | | | | | | | | | | | | | | | | | | | Also, add missing braces around if-block. Change-Id: I9390b2c7d5c4507923b6f06271a070dc868534e5 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | PackFileTest: Open ObjectInserter.Formatter in try-with-resourceDavid Pursehouse2016-02-021-109/+112
| | | | | | | | | | | | | | | Change-Id: I9c56b5efdb9c13b929073a786092a707fca21281 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | Merge branch 'stable-4.2'David Pursehouse2016-02-0110-1169/+1223
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.2: FileTreeIteratorTest: Open Git and RevWalk in try-with-resource RebaseCommandTest: Open RevWalk in try-with-resource PullCommandTest: Open RevWalk in try-with-resource BlameGeneratorTest: Create Git instances in try-with-resource Remove unnecessary suppression of deprecation warnings in tests DiffEntryTest: Open Git and TreeWalk in try-with-resource DiffCommandTest: Open Git and RevWalk in try-with-resource CommitCommandTest: Open Git and TreeWalk in try-with-resource Change-Id: Ic886ec9b1a4b3b46f9fa14188b4df832ce36cfa6 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | FileTreeIteratorTest: Open Git and RevWalk in try-with-resourceDavid Pursehouse2016-01-261-195/+204
| | | | | | | | | | | | | | | Change-Id: I6e68c4b028e0aa01964eace10307372060371df7 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | RebaseCommandTest: Open RevWalk in try-with-resourceDavid Pursehouse2016-01-251-178/+200
| | | | | | | | | | | | | | | Change-Id: If7b7a90171d1349d634a84f135471ebac29e3210 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | PullCommandTest: Open RevWalk in try-with-resourceDavid Pursehouse2016-01-251-15/+18
| | | | | | | | | | | | | | | Change-Id: I676cd7ef4bb29f980a313acd77506dd070e6c98f Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | BlameGeneratorTest: Create Git instances in try-with-resourceDavid Pursehouse2016-01-251-118/+119
| | | | | | | | | | | | | | | Change-Id: I2dc4191603fbd6c3214763b869882c51b0e53284 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | Remove unnecessary suppression of deprecation warnings in testsDavid Pursehouse2016-01-253-3/+0
| | | | | | | | | | | | | | | Change-Id: I722f8c2e80129e0129349b55a53b29626e2af21c Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | DiffEntryTest: Open Git and TreeWalk in try-with-resourceDavid Pursehouse2016-01-251-261/+272
| | | | | | | | | | | | | | | Change-Id: If4a49268b9b7ec3a44ed1508ed78db365b0c9e5b Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | DiffCommandTest: Open Git and RevWalk in try-with-resourceDavid Pursehouse2016-01-251-139/+144
| | | | | | | | | | | | | | | Change-Id: I966f7e5053651661abc7de63c968e1f5bf2de464 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | CommitCommandTest: Open Git and TreeWalk in try-with-resourceDavid Pursehouse2016-01-251-260/+266
| | | | | | | | | | | | | | | Change-Id: I65a6fd7028e209c300d992c2756100c09ab4dc19 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | Merge "Remove unused dependency to commons logging"Shawn Pearce2016-01-312-3/+1
|\ \ \
| * | | Remove unused dependency to commons loggingRüdiger Herrmann2016-01-242-3/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de> Change-Id: Ibbca0f7023350a5d424b6a5a84a5d11845a8ded7
* | | | Merge "Prevent ChainingCredentialsProvider from adding delegated providers ↵Matthias Sohn2016-01-281-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | twice"
| * | | | Prevent ChainingCredentialsProvider from adding delegated providers twiceRüdiger Herrmann2016-01-261-2/+0
| |/ / / | | | | | | | | | | | | | | | | Signed-off-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de> Change-Id: Icc0907af4fe26877d066db3c813dba37213a3ccc
* / / / [gitrepo] Support revision in remote tag.Yuxuan 'fishy' Wang2016-01-272-8/+87
|/ / / | | | | | | | | | | | | | | | | | | | | | Repo manifest file allows revision attribute in <remote> tag. This change teaches JGit to read that information. Change-Id: I1c878a2505b9d09fa09fbd404a119b71f2fb8fdb Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* | | Merge branch 'stable-4.2'Matthias Sohn2016-01-247-75/+82
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.2: ConcurrentRepackTest: Don't use deprecated WindowCache.reconfigure ConcurrentRepackTest: Open RevWalk in try-with-resource CommitOnlyTest: Open RevWalk in try-with-resource UnpackedObjectTest: Create ObjectInserter.Formatter in try-with-resource FileRepositoryBuilderTest: Use try-with-resource for auto-closeables RepositorySetupWorkDirTest: Fix "resource leak" warnings Remove java7 bundle from Maven central scripts Prepare 4.2.1-SNAPSHOT builds JGit v4.2.0.201601211800-r Add progress monitor to Merger Fix TransportException when reading bundle Fix unused throws CorruptObjectException from addTree Change-Id: I2325fb995561a6249b7b5e82fa413dfd34ef6007 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Merge changes Ifdb33501,Idc7b7bbd,Ia3db8696,I4ef82311,I3ad58d4c, ... into ↵Matthias Sohn2016-01-235-73/+82
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stable-4.2 * changes: ConcurrentRepackTest: Don't use deprecated WindowCache.reconfigure ConcurrentRepackTest: Open RevWalk in try-with-resource CommitOnlyTest: Open RevWalk in try-with-resource UnpackedObjectTest: Create ObjectInserter.Formatter in try-with-resource FileRepositoryBuilderTest: Use try-with-resource for auto-closeables RepositorySetupWorkDirTest: Fix "resource leak" warnings
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 11:45:56 +0000