summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix non-externalized string warning in Main.execute()Matthias Sohn2015-07-241-1/+1
| | | | Change-Id: Ib0404daaf485aa6c8dc6ba0b169b46fb800325e4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Honor also https_proxy environment variableChristian Halstrick2015-07-241-25/+31
| | | | | | | | | In addition to honor the http_proxy variable for setting a proxy for http JGit should also honor the https_proxy variable to set a similar proxy for https traffic Bug: 473365 Change-Id: I1002cb575e26cd842bf81ad751ec7c267b585ce2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix ResolveMerger when files should be replaced by foldersChristian Halstrick2015-07-232-7/+83
| | | | | | | | | | When during Merge for a certain path OURS & BASE contains a file and THEIRS contains a folder there was a bug in JGit leading to unnecessary conflicts. This commit fixes it and adds a test for this situation. Bug: 472693 Change-Id: I71fac5a6a2ef926c01adc266c6f9b3275e870129 Also-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge "Fix typos in javadoc of ObjectId.equals()"Matthias Sohn2015-07-211-4/+4
|\
| * Fix typos in javadoc of ObjectId.equals()Matthias Sohn2015-07-201-4/+4
| | | | | | | | Change-Id: Ic2503a2c3c616934d923937fdf8ceb4ae57b7028 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Don't keep empty ignore rules in the ignore node listAndrey Loskutov2015-07-213-2/+33
| | | | | | | | | | Change-Id: Icd893dfaba06561bbe5cc60ebf866ec5d8301c22 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
* | Allow leading/trailing spaces in ignore rulesAndrey Loskutov2015-07-212-2/+63
| | | | | | | | | | | | | | | | | | | | | | According to [1] leading spaces are allowed in ignore rules and trailing spaces are allowed too if they are escaped via backslash. [1] https://www.kernel.org/pub/software/scm/git/docs/gitignore.html Bug: 472762 Change-Id: I5e3ae5599cb9e5d80072f38c82c20cbc9475a18a Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
* | Don't crash while parsing ignore patternsAndrey Loskutov2015-07-214-1/+20
| | | | | | | | | | | | | | | | | | Catch unexpected PatternSyntaxException and convert it to InvalidPatternException. Log such errors, do not silently ignore them. Bug: 463581 Change-Id: Id0936d9816769ec0cfae1898beda0f7a3c146e67 Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Allow leading literal '#' and '!' in ignore rules if they are escapedAndrey Loskutov2015-07-212-15/+34
| | | | | | | | | | | | | | | | | | | | | | According to [1] backslash can escape leading special characters '#' and '!' in ignore rules, so that they are treated literally. [1] https://www.kernel.org/pub/software/scm/git/docs/gitignore.html Bug: 463581 Change-Id: I4c02927413a9c63ea5dbf2954877080d902ec1b2 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
* | Don't trim trailing space if it is escaped with backslashAndrey Loskutov2015-07-212-1/+30
| | | | | | | | | | | | | | | | | | | | According to [1] backslash can escape trailing space in ignore rules. [1] https://www.kernel.org/pub/software/scm/git/docs/gitignore.html Bug: 463581 Change-Id: I9cf13f8775cb49f0b6d61cfd3ca3fd6d665fccd8 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
* | Consider only escaping backslash for regular expressions in ignore rulesAndrey Loskutov2015-07-212-2/+30
|/ | | | | | | | | | | While checking if we should consider an ignore rule without '[]' brackets as a regular expression, check if the backslash escapes one of the glob special characters '?', '*', '[', '\\'. If not, backslash is not a part of a regex and should be treated literally. Bug: 463581 Change-Id: I85208c7f85246fbf6c5029ce3c8b7bb8f4dbd947 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
* DFS: Remove now-redundant getOneRefJonathan Nieder2015-07-161-9/+1
| | | | | | | Instead of reimplementing exactRef in a separate, private method, use it directly. Change-Id: I0fc06fc46eef0e36e571a6ef622f38dc2aa59038
* DFS: Override exactRef() with optimal versionShawn Pearce2015-07-161-0/+7
| | | | | | | This avoids scanning a directory to find all names and then weeding down to the requested name. Change-Id: I36ce31febad6e881182bc3a278c7ed35cc04cbda
* PushCertificate: Add toTextWithSignature() methodDave Borowitz2015-07-152-2/+16
| | | | Change-Id: Ic0129373cc0c0321ffa43dc11a658d4f891ec2c2
* PushCertificateParser: Add fromString methodDave Borowitz2015-07-152-3/+28
| | | | Change-Id: I74c3f65a9ff297f708d996a4c138456a31a466b8
* BaseReceivePack: Add method to override the push certDave Borowitz2015-07-151-0/+14
| | | | Change-Id: Id912f45c933c78a85b245fa7b6edebbeb40b009c
* BaseReceivePack: Don't throw from getPushCertificate()Dave Borowitz2015-07-151-3/+4
| | | | | | | | | Rather than lazily parsing the push in this method, parse it at the end of recvCommands(), which already contains the necessary try/catch for handling this error. This allows later callers to avoid having to handle this condition superfluously. Change-Id: I5dcaf1a44bf4e321adc281e3381e7e17ac89db06
* PushCertificateStore: Return boolean from batch save methodsDave Borowitz2015-07-152-3/+9
| | | | Change-Id: I9730cb4f60c60ee6d5a7a156a0b6a53f79309ec3
* Allow saving push certs on a subset of refsDave Borowitz2015-07-152-6/+91
| | | | | | | | | | | | | | | | Consider a BatchRefUpdate produced by Gerrit Code Review, where the original command pushed over the wire might refer to "refs/for/master", but that command is ignored and replaced with some additional commands like creating "refs/changes/34/1234/1". We do not want to store the cert in "refs/for/master@{cert}", since that may lead someone looking to the ref to the incorrect conclusion that that ref exists. Add a separate put method that takes a collection of commands, and only stores certs on those refs that have a matching command in the cert. Change-Id: I4661bfe2ead28a2883b33a4e3dfe579b3157d68a
* Update org.apache.httpcomponentsMatthias Sohn2015-07-146-24/+24
| | | | | | | | | | | - update org.apache.httpcomponents.httpcore to 4.3.3 - update org.apache.httpcomponents.httpclient to 4.3.6, 4.3.5 and later are reported to fix vulnerability CVE-2014-3577 CQ: 9220 CQ: 9221 Bug: 470523 Change-Id: I39b80b250c6c1daede6a23e9f177fb2988ac37bb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Access static member LocalDiskRepositoryTestCase.CONTENT directlyMatthias Sohn2015-07-141-6/+7
| | | | | | | | 37a1e4be moved this constant causing the following error message in Eclipse: "The static field LocalDiskRepositoryTestCase.CONTENT should be accessed directly". Change-Id: I4ceb57a30f2e5a8f7e55109ef260a244ed5e7044 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* PushCertificateStore: Add method to save in batchDave Borowitz2015-07-132-13/+79
| | | | Change-Id: I8bfaee1a52d368ffe2cd7e8af1754a5261569078
* Fixed @since tags on new APIAndrey Loskutov2015-07-122-2/+4
| | | | | Change-Id: I77bc2ec486ffe4c8b864663d103d8cf39c3f35e1 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
* Store push certificates in refs/meta/push-certsDave Borowitz2015-07-104-0/+753
| | | | | | | | | | | | | | | | | | | | | | | | | Inspired by a proposal from gitolite[1], where we store a file in a tree for each ref name, and the contents of the file is the latest push cert to affect that ref. The main modification from that proposal (other than lacking the out-of-git batching) is to append "@{cert}" to filenames, which allows storing certificates for both refs/foo and refs/foo/bar. Those refnames cannot coexist at the same time in a repository, but we do not want to discard the push certificate responsible for deleting the ref, which we would have to do if refs/foo in the push cert tree changed from a tree to a blob. The "@{cert}" syntax is at least somewhat consistent with gitrevisions(7) wherein @{...} describe operators on ref names. As we cannot (currently) atomically update the push cert ref with the refs that were updated, this operation is inherently racy. Kick the can down the road by pushing this burden on callers. [1] https://github.com/sitaramc/gitolite/blob/cf062b8bb6b21a52f7c5002d33fbc950762c1aa7/contrib/hooks/repo-specific/save-push-signatures Change-Id: Id3eb32416f969fba4b5e4d9c4b47053c564b0ccd
* Add setTargetBranch in RepoCommand.Yuxuan 'fishy' Wang2015-07-102-44/+86
| | | | | | | | This will allow us to write the super project in a branch other than master. Change-Id: I578ed9ecbc6423416239e31ad644531dae9fb5c3 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* Move `RepositoryTestCase.indexState` to parent classChris Price2015-07-102-106/+100
| | | | | | | | | | | | | | | The test helper method `indexState` in `RepositoryTestCase` is very useful for writing tests, even in cases where we need to do things like create more than one repository for a test and thus we don't want to use the built-in `db` member variable that exists in `RepositoryTestCase`. Since the method is static, we can move it up to the parent class `LocalDiskRepositoryTestCase`, where it can be used by tests that aren't a great fit for inheriting directly from `RepositoryTestCase`. Bug: 436200 Change-Id: I2b6de75c001d2d77ddb607488af246548784a67f Signed-off-by: Chris Price <chris@puppetlabs.com>
* Change `indexState` to static methodChris Price2015-07-101-1/+1
| | | | | | | | | The `indexState` method is no longer referring to any member variables from the class, so it can be made static. Bug: 436200 Change-Id: I013316de5c373417ea758ca6e17da29209fead53 Signed-off-by: Chris Price <chris@puppetlabs.com>
* Merge "Use local variable in RepositoryTestCase.indexState"Christian Halstrick2015-07-091-1/+1
|\
| * Use local variable in RepositoryTestCase.indexStateChris Price2015-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a signature of the test helper method `indexState`, in `RepositoryTestCase`, that accepts a `Repository` object as an argument. However, there was one line of code where this variable was not being used, and the method was instead referring to a member variable `db`. I believe this was probably just an oversight in a previous refactor, and that the correct behavior is to use the variable from the argument list. This change also has the benefit of making it possible to convert this method to a static method, since it no longer relies on any state from the class. Bug: 436200 Change-Id: Iac95b046dc5bd0b3756642e241c3637f1fad3609 Signed-off-by: Chris Price <chris@puppetlabs.com>
* | PushCertificateParser: Move reader parsing to instance methodDave Borowitz2015-07-091-17/+35
| | | | | | | | Change-Id: I8ab5fb97303e25b28187375b6f9ff28f918bdd43
* | PushCertificateParser: Make constructor publicDave Borowitz2015-07-091-1/+7
| | | | | | | | | | | | | | | | Primarily to aid in writing end-to-end tests, which must be written outside this package as we don't currently have a Bouncy Castle dependency. Change-Id: Ia24179773140d9ecc616b3a6b2e630c85d800157
* | Report PackProtocolExceptions to client during receive-packDave Borowitz2015-07-093-48/+54
| | | | | | | | | | | | | | We have done this since forever with the "wanted old new ref" error, so let's do it for other such errors thrown in the same block as well. Change-Id: Ib3b1c7f05e31a5b3e40e85eb07b16736920a033b
* | PushCertificate: implement hashCode/equals/toStringDave Borowitz2015-07-091-0/+42
| | | | | | | | Change-Id: Ib588a3f47492cee5e5e6274a3b088678919a0fa0
* | PushCertificateParser: Make pushee optionalDave Borowitz2015-07-093-7/+32
| | | | | | | | | | | | | | | | When pushing to an HTTP server using the C git client, I observed a certificate lacking a pushee field. Handle this gracefully in the parser. Change-Id: I7f3c5fa78f2e35172a93180036e679687415cac4
* | PushCertificateParser: Change error string for invalid fieldDave Borowitz2015-07-091-1/+1
| | | | | | | | | | | | | | The old one didn't take an argument; the new one includes the field name. Change-Id: I175dc75dcdd05ba6fdec315c04c79550cfdc2342
* | PushCertificateParser: Add method for parsing from a streamDave Borowitz2015-07-092-23/+200
| | | | | | | | | | | | | | | | | | We intend to store received push certificates somewhere, like a particular ref in the repository in question. For reading data back out, it will be useful to read push certificates (without pkt-line framing) in a streaming fashion. Change-Id: I70de313b1ae463407b69505caee63e8f4e057ed4
* | IO: Add a method for reading linesDave Borowitz2015-07-082-0/+185
| | | | | | | | Change-Id: Ib7be76aa7ac889354ad4782e2b64d4221a0e25b9
* | BaseReceivePack: Treat all LFs as optionalDave Borowitz2015-07-075-71/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussion on the git mailing list has concluded[1] that the intended behavior for all (non-sideband) portions of the receive-pack protocol is for trailing LFs in pkt-lines to be optional. Go back to using PacketLineIn#readString() everywhere. For push certificates specifically, we agreed that the payload signed by the client is always concatenated with LFs even though the client MAY omit LFs when framing the certificate for the wire. This is still reflected in the implementation of PushCertificate#toText(). [1] http://thread.gmane.org/gmane.comp.version-control.git/273175/focus=273412 Change-Id: I817231c4d4defececb8722142fea18ff42e06e44
* | BaseReceivePack: More validation during parseCommandDave Borowitz2015-07-074-25/+65
| | | | | | | | Change-Id: I25f3a5582a45dd0ec8f78f5daf74c2203797a184
* | Fix non-escaped quotes in JGitText.propertiesMatthias Sohn2015-07-071-8/+8
| | | | | | | | | | | | | | | | In most texts we use "cannot" hence instead of escaping the apostroph in "can't" use "cannot". Bug: 471796 Change-Id: Icda5b4db38076789d06498428909306aef3cb68b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Throw InvalidObjectIdException from ObjectId.fromString("tooshort")Jonathan Nieder2015-07-063-5/+29
| | | | | | | | | | | | | | | | | | | | | | ObjectId.fromString already throws InvalidObjectIdException for most malformed object ids, but for this kind it previously threw IllegalArgumentException. Since InvalidObjectIdException is a child of IllegalArgumentException, callers that catch IllegalArgumentException will continue to work. Change-Id: I24e1422d51607c86a1cb816a495703279e461f01 Signed-off-by: Jonathan Nieder <jrn@google.com>
* | Avoid double-colon in InvalidObjectIdException descriptionJonathan Nieder2015-07-063-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The invalidId message in JGitText and the asAscii bad id both contain a colon, so the resulting message would say Invalid id: : a78987c98798ufa Fix it by keeping the colon in the translated message and not adding another colon programmatically. Noticed by code inspection. Change-Id: I13972eebde27a4128828e6c64517666f0ba6288b Signed-off-by: Jonathan Nieder <jrn@google.com>
* | Compare API against 4.0.0.201506090130-rMatthias Sohn2015-06-241-1/+1
| | | | | | | | | | Change-Id: I7cb7e89875b5238a54411b8c43c298d4cbe9f7ac Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-4.0'Matthias Sohn2015-06-242-20/+81
|\ \ | | | | | | | | | Change-Id: I5c965206ad10bababe366a51ab7c33a8836a7868 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Prepare 4.0.2-SNAPSHOT buildsMatthias Sohn2015-06-2446-248/+248
| | | | | | | | | | | | | | | Change-Id: I645cacfdde21aa28aa2e17c10dec0576b170ed0e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | JGit v4.0.1.201506240215-rv4.0.1.201506240215-rMatthias Sohn2015-06-2446-49/+49
| | | | | | | | | | | | | | | Change-Id: Ib7713b657e7812b0debd72bb4eece0daa187e80d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Add a grace period for packfiles during GCChristian Halstrick2015-06-222-20/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | For loose objects an expiration date can be set which will save too young objects from being deleted. Add the same for packfiles. Packfiles which are too young are not deleted. Bug: 468024 Change-Id: I3956411d19b47aaadc215dab360d57fa6c24635e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | API to remove repositories from RepositoryCacheTobias Oberlies2015-06-232-0/+56
| |/ |/| | | | | | | | | | | | | | | Add methods that allow to unregister repositories from the RepositoryCache individually. Bug: 470234 Change-Id: Ib918a634d829c9898072ae7bdeb22b099a32b1c9 Signed-off-by: Tobias Oberlies <tobias.oberlies@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | SignedPushConfig: Allow setting a custom nonce generator implDave Borowitz2015-06-182-8/+44
| | | | | | | | Change-Id: Ic0156a7d65d99881ef27801fcce7754594c436f0
* | PackCertificateParser: return null if nothing was receivedDave Borowitz2015-06-183-32/+105
| | | | | | | | | | | | Add test for this case in both the enabled and disabled cases. Change-Id: If9d12192a2dc9f9dd1eac9844b5a7b0edadc0b34
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-09 02:28:39 +0000