summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
Commit message (Collapse)AuthorAgeFilesLines
* LogCommand: Remove outdated TODO and improve docsRobin Stocker2013-08-251-3/+17
| | | | | Change-Id: I368be12e7bdc3c711e9f474ead312006513764b7 Signed-off-by: Robin Stocker <robin@nibor.org>
* Enable LsRemoteCommand to work without local repositoryRobin Stocker2013-08-132-1/+18
| | | | | | | | 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>
* Add missing @since tag for replaceLineBreaksWithSpaceRobin Stocker2013-08-121-0/+1
| | | | | Change-Id: Ibd9d9ba609a2cd7707b985cdb07405dce0422aab Signed-off-by: Robin Stocker <robin@nibor.org>
* Allow the command line bundle to access internal jgit packagesMatthias Sohn2013-08-111-2/+8
| | | | Change-Id: Id1e11a21fdcbd8cb0f2f8c22e7ab253e8df65d2f 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-104-5/+35
|\
| * Recognize CRLF when parsing the short message of a commit or tagRobin Rosenberg2013-06-144-5/+35
| | | | | | | | | | Bug: 400707 Change-Id: I9b09bb88528af465018fc0278f5441f7e6b75986
* | Merge "Added characters to be escaped in file name patterns"Robin Rosenberg2013-08-101-20/+44
|\ \
| * | Added characters to be escaped in file name patternsGustav Karlsson2013-04-061-20/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Add missing @since tagsLars Vogel2013-08-103-0/+8
| | | | | | | | | | | | | | | Change-Id: I9754e2124c0fe6ad2dbde5597c3ed10f1c3efef5 Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Advertise capabilities with no refs in upload service.Colby Ranger2013-08-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With reference hiding, it is possible for a repository to appear empty when all refs are hidden. This causes capabilities to not be advertised either, since they are published with the first reference, breaking fetch by SHA1 support. Always advertise the capabilites by publishing the symbolic capabilities reference when the repository has no references to advertise (similar to the receive service). Change-Id: I8060e430ee03571dc51239e702864c85e888505c
* | | Allow UploadPack requests with no optionsShawn Pearce2013-08-071-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UploadPack can be invoked with no capabilities selected by the client if the client is an ancient version of Git that nobody in their right mind should still be using. Or if the client is very broken and does not want to use any of the newer features added to the protocol since its inception. Change-Id: I3baa6f90e6a41a37a8eab8449a3cc41f4efcb91a
* | | Send no-progress option with NullProgressMonitor.Colby Ranger2013-08-051-1/+10
| | | | | | | | | | | | | | | | | | | | | The NullProgressMonitor does not report progress anywhere. Inform the server not to send progress by enabling the no-progress capability. Change-Id: Id18dbc754c814d1a5534a284c947030bf201c569
* | | Merge "Change RequestValidator parameter to ObjectId list"Shawn Pearce2013-08-021-21/+34
|\ \ \
| * | | Change RequestValidator parameter to ObjectId listGreg Hill2013-08-021-21/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of RevObject list, this allows a custom request validator to be called on SHA-1's corresponding to objects that may not exist in repository storage Change-Id: I19bb667beff0d0c144150a61d7a1dc6c9703be7f Signed-off-by: Greg Hill <greghill@google.com>
* | | | Add setter for ProgressMonitor to StatusCommandChristian Trutz2013-07-281-1/+20
|/ / / | | | | | | | | | | | | | | | | | | | | | This is useful if Git.status() is a long running command. Change-Id: I6bdbf347a688043d549c1f091fb4a264a6c7024e Signed-off-by: Christian Trutz <christian.trutz@gmail.com> Signed-off-by: Robin Stocker <robin@nibor.org>
* | | Implement open(URIish) for TransportLocalRobin Stocker2013-07-212-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Fix NPE in openFetch on Transport without local repositoryRobin Stocker2013-07-212-14/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the walk and other fields to null will result in NPEs when the user e.g. calls fetch on the connection, but at least the advertised refs can be read like that without having a local repository. Bug: 413389 Change-Id: I39c8363e81a1c7e6cb3412ba88542ead669e69ed Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | Add NON-NLS comments for some obviously untranslatable stringsRobin Rosenberg2013-07-219-10/+10
| | | | | | | | | | | | | | | Change-Id: I2d1076b46695dac84961b8ae663bfc5cb123b3a3 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | Update reflog like C Git during rebase (non-interactive)Robin Rosenberg2013-07-212-13/+40
| | | | | | | | | | | | | | | | | | Bug: 346350 Change-Id: I119766a00bc52a810c51cffaa19207cb8555ca22 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | Improve documentation of PathSuffixFilterRobin Stocker2013-07-211-3/+11
| | | | | | | | | | | | | | | | | | Change-Id: I1077dbb1f10c7cc687c0d1b8a8e8f763ca96977c Signed-off-by: Robin Stocker <robin@nibor.org> 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 MERGED_NOT_COMMITTED toStringRobin Stocker2013-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | It had a typo (commited) and was not in the style of the others. Change-Id: Ia1be1c70b13bb2f3da80c8e8239c5f254070fe60 Signed-off-by: Robin Stocker <robin@nibor.org>
* | | Merge "Add missing @since tags"Matthias Sohn2013-07-121-0/+2
|\ \ \
| * | | Add missing @since tagsMatthias Sohn2013-07-111-0/+2
| | | | | | | | | | | | | | | | Change-Id: I6f672249d7ca014c63fb939cd0836689eb27ab90 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Merge "Fix bugs in TreeWalk#isPathSuffix used by PathSuffixFilter"Christian Halstrick2013-07-111-3/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Fix bugs in TreeWalk#isPathSuffix used by PathSuffixFilterRobin Stocker2013-07-081-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | | | Add tests for DirCacheCheckout and symlinksChristian Halstrick2013-07-101-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DirCacheCheckout had a bug when the parentdirectory of a worktree was a symlink. DirCacheCheckout was deleting those symlinks under certain conditions. This was fixed in I81735ba0394ef6794e9b2b8bdd8bd7e8b9c6460f without a test because previously it was hard to setup tests containing symlinks. BUG: 412489 Change-Id: I2513166af519d6fc01d1eae3976ad6cff6f98530 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Merge changes If386fe25,I52a17499,Id12e7f00,I264e028a,I0d52af8a,I0d0cc4f8Dave Borowitz2013-07-103-50/+294
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: UploadPack: allow custom RequestValidator instances UploadPack: refactor want validation UploadPack: set RefFilter from TransportConfig UploadPack: configure RequestPolicy with TransportConfig UploadPack: advertise allow-tip-sha1-in-want Add RequestPolicy.TIP to allow fetching non-advertised ref tips
| * | | | UploadPack: allow custom RequestValidator instancesDave Borowitz2013-07-031-33/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the existing concrete implementations public as well so custom implementations may delegate to them where appropriate. Treat all custom implementations as providing allow-tip-sha1 in want. Change-Id: If386fe25c0d3b4551a97c16a22350714453b03e9
| * | | | UploadPack: refactor want validationDave Borowitz2013-07-031-67/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Associate each RequestPolicy with an implementation of a RequestValidator interface that contains the validation logic. The checkWants method is only called if there are wants that were not advertised, since clients may always request any advertised want according to the git protocol. Calling the method only once at the end of parsing the want list also means policy implementations can be stateful, unlike the previous switch statement inside a loop. For the special handling of unidirectional pipes, simply check isBiDirectional() and delegate to other implementations if necessary. Change-Id: I52a174999ac3a5aca46d3469cb0b81edd1710580
| * | | | UploadPack: set RefFilter from TransportConfigDave Borowitz2013-07-032-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach TransportConfig to respect uploadpack.hiderefs, which is new in C git 1.8.2. Change-Id: Id12e7f00b9a60258e996410f67fa10616459f53f
| * | | | UploadPack: configure RequestPolicy with TransportConfigDave Borowitz2013-07-032-9/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C git 1.8.2 supports setting the equivalent of RequestPolicy.TIP with uploadpack.allowtipsha1. Parse this into TransportConfig and use it from UploadPack. An explicitly set RequestPolicy overrides the config, and the policy may still be upgraded on a unidirectional connection to avoid races. Defer figuring out the effective RequestPolicy to later in the process. This is a minor semantic change to fix a bug: previously, calling setRequestPolicy(ADVERTISED) _after_ calling setBiDirectionalPipe(true) would have reintroduced the race condition otherwise fixed by 01888db892aa9590862d886c01f3b293140db153. Change-Id: I264e028a76574434cecb34904d9f5944b290df78
| * | | | UploadPack: advertise allow-tip-sha1-in-wantDave Borowitz2013-07-032-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This protocol capability, new in C git 1.8.2, corresponds to RequestPolicy.TIP, so advertise it if that request policy was set. Change-Id: I0d52af8a7747e951a87f060a5124f822ce1b2b26
| * | | | Add RequestPolicy.TIP to allow fetching non-advertised ref tipsDave Borowitz2013-07-031-21/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users of UploadPack may set a custom RefFilter or AdvertisedRefsHook that limits which refs are advertised, but clients may learn of a SHA-1 that the server should have as a ref tip through some alternative means. Support serving such objects from the server side with a new RequestPolicy. As with ADVERTISED, we need a special relaxed RequestPolicy to allow commits reachable from the set of valid tips for unidirectional connections. Change-Id: I0d0cc4f8ee04d265e5be8221b9384afb1b374315
* | | | | Make sure checkout is not deleting folders outside the workingtreeChristian Halstrick2013-07-101-2/+2
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a chance that jgit deletes symbolic links which point to the folder on top of the working tree. Make sure not to touch these resources. Thanks to Cedric Darloy who reported this bug on http://www.eclipse.org/forums/index.php/m/776910/#msg_776910 and to Ondrej Vrabec who reported bug 412489. Bug: 412489 Change-Id: I81735ba0394ef6794e9b2b8bdd8bd7e8b9c6460f Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Robin Stocker <robin@nibor.org>
* | | | Check parentFile is not nullHiroshi Tomita2013-07-051-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | parentFile becomes null when f is relative path, such as ".". This patch avoids NullPointerException in such case. Change-Id: I4752674b1daab6eedd7c3650c7749462810eaffd Signed-off-by: Hiroshi Tomita <tomykaira@gmail.com>
* | | Merge "Update HEAD in cherry-picking several commits"Robin Stocker2013-07-021-5/+4
|\ \ \
| * | | Update HEAD in cherry-picking several commitsHiroshi Tomita2013-07-011-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-283-12/+58
|/ / / | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Fix HTTP response processing for WWW-Authenticate headersAlex Rukhlin2013-06-231-17/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Add a method to DfsOutputStream to read as an InputStreamDave Borowitz2013-06-193-39/+145
| | | | | | | | | | | | Change-Id: I0ec1f17a88bc14f22c10f9bc8d6f5b5118410e3a
* | | 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
* | Add missing @since tagsMatthias Sohn2013-06-153-8/+13
| | | | | | | | Change-Id: I7f2c155cab4b5be55f7e849ff2595c8c5d804f05 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Prepare 3.1.0-SNAPSHOT buildsMatthias Sohn2013-06-133-35/+35
| | | | | | | | | | Change-Id: I7490a7c9558423c03e3c167ad55b9a98be9d99d9 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>
* | Pick default archive format based on filename suffixJonathan Nieder2013-06-061-3/+58
| | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 22:41:57 +0000