summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make HTTP test project work in EclipseRobin Rosenberg2010-01-237-0/+94
| | | | | | | | | | | The Jetty components are not available as part of Eclipse, but a P2 packaged version can be found via [1] for Eclipse 3.5 and newer. [1] http://wiki.eclipse.org/Jetty-OSGi_SDK Change-Id: Ibd5930bb9fc9589125876ca50c52e58bd31b051c Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Add JUnit tests for HTTP transportShawn O. Pearce2010-01-1222-18/+3476
| | | | | | | | No Eclipse support for this project is provided, because the Jetty project does not publish a complete P2 repository. Change-Id: Ic5fe2e79bb216e36920fd4a70ec15dd6ccfd1468 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Download HEAD by itself if not in info/refsShawn O. Pearce2010-01-121-10/+59
| | | | | | | | | | The dumb HTTP transport needs to download the HEAD ref and resolve it manually if HEAD does not appear in info/refs. Its typically for it to not be in the info/refs file. Change-Id: Ie2a58fdfacfeee530b10edb433b8f98c85568585 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* client side smart HTTPShawn O. Pearce2010-01-125-55/+606
| | | | | | | | | | | | | | | | | | | During fetch over http:// clients now try to take advantage of the info/refs?service=git-upload-pack URL to determine if the remote side will support a standard upload-pack command stream. If so each block of 32 have lines is sent in one POST request, prefixed by all of the 'want' lines and any previously discovered common bases as 'have' lines. During push over http:// clients now try to take advantage of the info/refs?service=git-receive-pack URL to determine if the remote side will support a standard receive-pack command stream. If so, commands are sent along with their pack in a single HTTP POST request. Bug: 291002 Change-Id: I8c69b16ac15c442e1a4c3bd60b4ea1a47882b851 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* server side: smart fetch over HTTPShawn O. Pearce2010-01-124-0/+312
| | | | | | | | | | | | | | | | | | | | Clients can request smart fetch support by examining the info/refs URL with the service parameter set to the magic git-upload-pack string: GET /$GIT_DIR/info/refs?service=git-upload-pack HTTP/1.1 The response is formatted with the upload pack capabilities, using the standard packet line formatter. A special header line is put in front of the standard upload-pack advertisement to let clients know the service was recognized and is supported. If the requested service is disabled an authorization status code is returned, allowing the user agent to retry once they have obtained credentials from a human, in case authentication is required by the configured UploadPackFactory implementation. Change-Id: Ib0f1a458c88b4b5509b0f882f55f83f5752bc57a Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* server side: smart push over HTTPShawn O. Pearce2010-01-125-5/+482
| | | | | | | | | | | | | | | | | | | | Clients can request smart push support by examining the info/refs URL with the service parameter set to the magic git-receive-pack string: GET /$GIT_DIR/info/refs?service=git-receive-pack HTTP/1.1 The response is formatted with the receive pack capabilities, using the standard packet line formatter. A special header block is put in front of the standard receive-pack advertisement to let clients know the service was recognized and is supported. If the requested service is disabled an authorization status code is returned, allowing the user agent to retry once they have obtained credentials from a human, in case authentication is required by the configured ReceivePackFactory implementation. Change-Id: Ie4f6e0c7b68a68ec4b7cdd5072f91dd406210d4f Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Simple dumb HTTP server for GitShawn O. Pearce2010-01-1242-17/+4000
| | | | | | | | | | | | | | | | | | | | | | This is a simple HTTP server that provides the minimum server side support required for dumb (non-git aware) transport clients. We produce the info/refs and objects/info/packs file on the fly from the local repository state, but otherwise serve data as raw files from the on-disk structure. In the future we could better optimize the FileSender class and the servlets that use it to take advantage of direct file to network APIs in more advanced servlet containers like Jetty. Our glue package borrows the idea of a micro embedded DSL from Google Guice and uses it to configure a collection of Filters and HttpServlets, all of which are matched against requests using regular expressions. If a subgroup exists in the pattern, it is extracted and used for the path info component of the request. Change-Id: Ia0f1a425d07d035e344ae54faf8aeb04763e7487 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Expose PacketLineOut for reuse outside of the transport packageShawn O. Pearce2010-01-122-10/+74
| | | | | Change-Id: Iaa331a476e28cf2880df5607de36bc9f67d041df Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Expose RefAdvertiser for reuse outside of the transport packageShawn O. Pearce2010-01-123-23/+165
| | | | | | | | | By making this class and its methods public, and the actual writing abstract, we can reuse this code for other formats like writing an info/refs file for HTTP transports. Change-Id: Id0e349c30a0f5a8c1527e0e7383b80243819d9c5 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Teach UploadPack how to use an RPC style interfaceShawn O. Pearce2010-01-121-5/+55
| | | | | | | | | | | | | If biDirectionalPipe is false UploadPack does not start out with the advertisement but instead assumes it should read one block of want/have lines, process that, and write the ACK/NAKs out. This means it only is doing one read through the input followed by one write to the output, which fits with the HTTP request processing model, and any other type of RPC system. Change-Id: Ia9f7c46ee556f996367180f15d2caa8572cdd59f Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Teach ReceivePack how to use an RPC style interfaceShawn O. Pearce2010-01-121-2/+43
| | | | | | | | | | | | | If biDirectionalPipe is false ReceivePack does not start out with the advertisement but instead assumes it should read the command set once, process that, and write the status report out. This means it only is doing one read through the input followed by one write to the output, which fits with the HTTP request processing model, and any other type of RPC system... assuming that the payload for input can be a very big entity like the command stream followed by the pack file. Change-Id: I6f31f6537a3b7498803a8a54e10b0622105718c1 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Refactor TemporaryBuffer to support reuse in other contextsShawn O. Pearce2010-01-127-123/+238
| | | | | | | | | | | | | | | | Later we are going to add support for smart HTTP, which requires us to buffer at least some of the request created by a client before we ship it to the server. For many requests, we can fit it completely into a 1 MiB buffer, but if it doesn't we can drop back to using the chunked transfer encoding to send an unknown stream length. Rather than recoding the block based memory buffer, we refactor the local file overflow strategy into a subclass, allowing the HTTP client code to replace this portion of the logic with its own approach to start the chunked encoding request. Change-Id: Iac61ea1017b14e0ad3c4425efc3d75718b71bb8e Signed-off-by: Shawn O. Pearce <sop@google.com>
* Implement multi_ack_detailed protocol extensionShawn O. Pearce2010-01-124-35/+134
| | | | | | | | | | The multi_ack_detailed extension breaks out the "ACK %s continue" status code into "ACK %s common" and "ACK %s ready" states, making it easier to discover which objects are truely common, and which objects are simply on a chain the server doesn't care learning about. Change-Id: Ie8e907424cfbbba84996ca205d49eacf339f9d04 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Abstract out utility functions for creating test commitsShawn O. Pearce2010-01-129-102/+704
| | | | | | | | | These routines create a fairly clean DSL for writing out the structure of a repository in a test case. Abstract them into a helper class that we can reuse in other test environments. Change-Id: I55cce3d557e1a28afe2fdf37b3a5b67e2651c9f1 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Fix PersonIdent to always use SystemReaderShawn O. Pearce2010-01-121-1/+4
| | | | | | | | | | Under unit tests we want the when and timezone to come from the MockSystemReader and be stable. We did this for the default constructor based on the Repository, but failed to do it for the name,emailAddress variant of the constructor. Change-Id: I608ac7cf01673729303395e19b379b38fef136b3 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Fix RefWriter creation of info/refs to omit HEADShawn O. Pearce2010-01-121-2/+2
| | | | | | | | | | We really mean to omit HEAD here, but botched the difference between getOrigName and getName on the Ref object. We tested on the wrong value, picking up the target of the symbolic ref and therefore included it twice. Change-Id: If780c65166ccada2e63a4f42bbab752a56b16564 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Move TestRng to our JUnit helper packageShawn O. Pearce2010-01-122-2/+20
| | | | | | | | Other test suites may find this useful, especially when trying to defeat the pack file compression with random data files. Change-Id: Ic00a4ac626af7a1c94d18ee99305e295b267b1a3 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Correct spelling error in StringUtils javadocShawn O. Pearce2010-01-121-3/+3
| | | | | Change-Id: Idd98530d5f6fca4de8631aa865e4bcd6e6cf9306 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Finish removing Apache Felix maven-bundle-pluginShawn O. Pearce2010-01-1211-115/+6
| | | | | | | | | | | | | | | | Since Robin reverted using the maven-bundle-plugin to produce the OSGi manifest, there is no reason for us to reference it from our build process anymore. Also, when Robin reverted the to the Eclipse way of doing things, we failed to update the ignore files to ignore our generated files but not ignore our tracked .classpath. Finally, we cannot delete the MANIFEST.MF file during a Maven build, as this is once again a source file. Change-Id: I53f77f2002cb4285f728968829560e835651e188 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Fix merge for "Partial revert "Switch build to Apache Felix ↵Robin Rosenberg2010-01-121-0/+1
| | | | | | | | | maven-bundle-plugin"" There was a missing dependency. Change-Id: Ib7b9f05ee4c7c2bd7760ce44a7c2cd72759d514d Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* Merge "Partial revert "Switch build to Apache Felix maven-bundle-plugin""Robin Rosenberg2010-01-1243-82/+548
|\
| * Partial revert "Switch build to Apache Felix maven-bundle-plugin"Robin Rosenberg2010-01-1043-82/+548
| | | | | | | | | | | | | | | | | | | | This restores the ability to build using just Eclipse without strange procedures, extra plugins and it is again possible to work on both JGit and EGit in the same Eclipse workspace with ease. Change-Id: I0af08127d507fbce186f428f1cdeff280f0ddcda Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* | Read core.worktree regardless of whether .git was discovered or notRobin Rosenberg2010-01-061-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | The C Git documentation stated that the core.worktree config was not read when the .git directory was found implicitly (from the working directory). This was not true, and had not been so for a long time. The documentation has been updated to document the existing behaviour. Change-Id: If1e81b6a981b9d70e849f24872f01c110e9bc950 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Explicitly release resources used by java.util.zip.DeflaterIgor Fedorenko2010-01-061-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Deflater can use significant amount of native (i.e. C) heap space. Failure to promptly release this memory results in native memory leak in some cases, particularly severe for VMs with large java max heap size. For example, running Team->Commit in one of my EGit workspaces results in ~500M java process size increase without any significant change to amount of used java heap when JVM is started with -Xmx1024m. Change-Id: I649679a8df5683ebedd9380d703513d31c625932 Signed-off-by: Igor Fedorenko <igor@ifedorenko.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Use build timestamp as OSGi version qualifier for SNAPSHOT buildsIgor Fedorenko2010-01-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default maven-bundle-plugin behaviour results in use of the same .SNAPSHOT OSGi bundle version qualifier for all snapshot builds. This causes problems for eclipse update manager and other consumers that rely on OSGi bundle metadata to select "newer" or "best matching" version of jgit bundle. To solve the problem, maven-bundle-plugin is configured to replace .SNAPSHOT with build timestamp in format like 20100106-1234. Change-Id: I0999c7bd68aa2ee74dffaed54a8dc4e1b67cf80d Signed-off-by: Igor Fedorenko <igor@ifedorenko.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Remove unnecessary semicolon in MergeChunkShawn O. Pearce2010-01-061-1/+2
| | | | | | | | | | Change-Id: I5526edca9816b90f5df2d7f14f24f11d3f5d2ead Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Merge branch 'cq-diff'Shawn O. Pearce2010-01-0617-1/+2275
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per CQ 3559 "JGit - Eugene Myers O(ND) difference algorithm" we have approval to check this into our master branch. * cq-diff: Add file content merge algorithm Add performance tests for MyersDiff Add javadoc comments, remove unused code, shift comments to correct place Fixed MyersDiff to be able to handle more than 100k Fix some warnings regarding unnecessary imports and accessing static methods Add the "jgit diff" command Prepare RawText for diff-index and diff-files Add a test class for Myers' diff algorithm Add Myers' algorithm to generate diff scripts Add set to IntList Conflicts: org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java Change-Id: Ia8e98d81ba1ab52f84d0258a40e6ef5eece9a5b1 CC: Christian Halstrick <christian.halstrick@sap.com>
| * | Add file content merge algorithmChristian Halstrick2010-01-065-0/+875
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the file content merge alorithm and tests for merge to jgit. The merge algorithm: - Gets as input parameters the common base, the two new contents called "ours" and "theirs". - Computes the Edits from base to ours and from base to theirs with the help of MyersDiff. - Iterates over the edits. - Independent edits from ours or from theirs will just be applied to the result. - For conflicting edits we first harmonize the ranges of the edits so that in the end we have exactly two edits starting and ending at the same points in the common base. Then we write the two conclicting contents into the result stream. Change-Id: I411862393e7bf416b6f33ca55ec5af608ff4663 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> [sp: Fixed up two awkard comments in documentation.] Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | Add performance tests for MyersDiffChristian Halstrick2009-11-053-0/+397
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some tests which make sure that the diff algorithm really behaves in the promised O(N*D) manner. This tests compute diffs between multiple big chunks of data, measure time for computing the diffs and fail if the measured times are off O(N*D) by more than a factor 10 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Change-Id: I8e1e0be60299472828718371b231f1d8a9dc21a7 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
| * | Add javadoc comments, remove unused code, shift comments to correct placeChristian Halstrick2009-10-093-25/+97
| | | | | | | | | | | | | | | | | | | | | | | | This change only fixes warnings of the eclipse build regarding missing javadocs. Some comments where just missing, so they have been added. Other comments where at the wrong (from eclipse point of view) place, so eclipse was complaining. Also two method which existed for debugging purposes have been removed to get rid of Eclipse warngins about unused code.
| * | Merge change Iacb9082e into cq-diffCode Review2009-10-082-16/+171
| |\ \ | | | | | | | | | | | | | | | | * changes: Fixed MyersDiff to be able to handle more than 100k
| | * | Fixed MyersDiff to be able to handle more than 100kChristian Halstrick2009-10-092-16/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MyersDiff was crashing with ArrayIndexOutOfBoundsException when diffing huge files. This was because the snake data (begin and end position while processing chunks of the text) was sequeezed into a single int. But with longer texts to diff these values exceeded the range of java int values. It is fixed by squeezing the two ints into a long and by adding the LongList helper class. Change-Id: Iacb9082e1b076e994d1486aa8e512342ad7432b3 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
| * | | Fix some warnings regarding unnecessary imports and accessing static methodsChristian Halstrick2009-10-071-13/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | My Galileo eclipse was complaining about unneeded import statements and how static methods have been accessed in Diff.java. There was also one method call which could be removed because he had no sideeffects and the return value was not used. I fixed this so that there are no warnings anymore. Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Change-Id: I48d7e01536aab1524140d72af574e3fd7149cd23
| * | Add the "jgit diff" commandJohannes Schindelin2009-10-063-1/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit contains fixes provided by Christian Halstrick. Bug: 291083 Eclipse-CQ: 3559 Change-Id: If8d187e70a51f31040f99098489e513791dc6415 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | Prepare RawText for diff-index and diff-filesJohannes Schindelin2009-10-061-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 291083 Eclipse-CQ: 3559 Change-Id: Ia02f346a96b5f1e24f8bc9676bd428b968a41222 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | Add a test class for Myers' diff algorithmJohannes Schindelin2009-10-061-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 291083 Eclipse-CQ: 3559 Change-Id: I5a10946637438052e7596489b9f9de3a0c6b2066 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | Add Myers' algorithm to generate diff scriptsJohannes Schindelin2009-10-061-0/+469
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Myers' algorithm is the standard way to generate diff scripts in an efficient manner (especially memory-wise). The source contains extensive documentation about the principal ideas of the algorithm. Bug: 291083 Eclipse-CQ: 3559 Change-Id: Id873e7c2c204692cb4a1a05d24b733154b9ed49c Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | Add set to IntListJohannes Schindelin2009-10-062-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some applications may wish to modify an int list. Bug: 291083 Eclipse-CQ: 3559 Change-Id: Iea871443ec661230aec92397229f1eda6c74216f Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | Fix code formatter style referencesShawn O. Pearce2010-01-052-6/+6
| | | | | | | | | | | | | | | | | | | | | We call it "JGit Format", not "JGit". Change-Id: Idd20557d21fe20602c00a60bfeaea78d3c95fe5e Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | UnionInputStream: combines sequential InputStreams into oneShawn O. Pearce2010-01-042-0/+425
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UnionInputStream utility class combines multiple sequential InputStreams so they appear to the caller as a single stream with no gaps. This can be used to concentate streams coming from multiple independent HTTP connections (for example). The companion unit test covers the class's full functionality. Change-Id: I0676c7b5e082a5886bf0e8f43f9fd6c46a666228 Signed-off-by: Shawn O. Pearce <sop@google.com>
* | | Add getPacks to ObjectDirectoryShawn O. Pearce2010-01-041-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | This exposes the list of known packs, allowing callers to list them into a context like the objects/info/packs file. Change-Id: I0b889564bd176836ff5c77ba310c6d229409dcd5 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | Merge change I67d3ed54Code Review2009-12-281-0/+3
|\ \ \ | |_|/ |/| | | | | | | | * changes: Added -crfl attribute for DiffFormatterReflowTest test data
| * | Added -crfl attribute for DiffFormatterReflowTest test dataConstantine Plotnikov2009-12-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test data is expected to have unix new lines by tests, but it is converted to crlf on Windows platform (with msys git). As result DiffFormatterReflowTest tests fail. To prevent this problem, crlf conversion is disbled for test data related to that test. Bug: 295077 Change-Id: I67d3ed543fcc38647041896146de12b1781ec6be Signed-off-by: Constantine Plotnikov <constantine.plotnikov@gmail.com>
* | | Switch build to Apache Felix maven-bundle-pluginShawn O. Pearce2009-12-2855-717/+309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tycho isn't production ready for projects like JGit to be using as their primary build driver. Some problems we ran into with Tycho 0.6.0 that are preventing us from using it are: * Tycho can't run offline The P2 artifact resolver cannot perform its work offline. If the build system has no network connection, it cannot compile a project through Tycho. This is insane for a distributed version control system where developers are used to being offline during development and local testing. * Magic state in ~/.m2/repository/.meta/p2-metadata.properties Earlier iterations of this patch tried to use a hybrid build, where Tycho was only used for the Eclipse specific feature and P2 update site, and maven-bundle-plugin was used for the other code. This build seemed to work, but only due to magic Tycho specific state held in my local home directory. This means builds are not consistently repeatable across systems, and lead me to believe I had a valid build, when in fact I did not. * Manifest-first build produces incomplete POMs The POM created by the manifest-first build format does not contain the dependency chain, leading a downstream consumer to not import the runtime dependencies necessary to execute the bundle it has imported. In JGit's case, this means JSch isn't included in our dependency chain. * Manifest-first build produces POMs unreadable by Maven 2.x JGit has existing application consumers who are relying on Maven 2.x builds. Forcing them to step up to an alpha release of Maven 3 is simply unacceptable. * OSGi bundle export data management is tedious Editing each of our pom.xml files to mark a new release is difficult enough as it is. Editing every MANIFEST.MF file to list our exported packages and their current version number is something a machine should do, not a human. Yet the Tycho OSGi way unfortunately demands that a human do this work. * OSGi bundle import data management is tedious There isn't a way in the MANIFEST.MF file format to reuse the same version tags across all of our imports, but we want to have a consistent view of our dependencies when we compile JGit. After wasting more than 2 full days trying to get Tycho to work, I've decided its a lost cause right now. We need to be chasing down bugs and critical features, not trying to bridge the gap between the stable Maven repository format and the undocumented P2 format used only by Eclipse. So, switch the build to use Apache Felix's maven-bundle-plugin. This is the same plugin Jetty uses to produce their OSGi bundle manifests, and is the same plugin used by the Apache Felix project, which is an open-source OSGi runtime. It has a reasonable number of folks using it for production builds, and is running on top of the stable Maven 2.x code base. With this switch we get automatically generated MANIFEST.MF files based on reasonably sane default rules, which reduces the amount of things we have to maintain by hand. When necessary, we can add a few lines of XML to our POMs to tweak the output. Our build artifacts are still fully compatible with Maven 2.x, so any downstream consumers are still able to use our build products, without stepping up to Maven 3.x. Our artifacts are also valid as OSGi bundles, provided they are organized on disk into a repository that the runtime can read. With maven-bundle-plugin the build runs offline, as much as Maven 2.x is able to run offline anyway, so we're able to return to a distributed development environment again. By generating MANIFEST.MF at the top level of each project (and therefore outside of the target directory), we're still compatible with Eclipse's PDE tooling. Our projects can be imported as standard Maven projects using the m2eclipse plugin, but the PDE will think they are vaild plugins and make them available for plugin builds, or while debugging another workbench. This change also completely removes Tycho from the build. Unfortunately, Tycho 0.6.0's pom-first dependency resolver is broken when resolving a pom-first plugin bundle through a manifest-first feature package, so bundle org.eclipse.jgit can't be resolved, even though it might actually exist in the local Maven repository. Rather than fight with Tycho any further, I'm just declaring it plugina-non-grata and ripping it out of the build. Since there are very few tools to build a P2 format repository, and no documentation on how to create one without running the Eclipse UI manually by poking buttons, I'm declaring that we are not going to produce a P2 update site from our automated builds. Change-Id: If7938a86fb0cc8e25099028d832dbd38110b9124 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | Recognize Git repository environment variablesRobin Rosenberg2009-12-287-24/+415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the jgit command line behave like the C Git implementation in the respect. These variables are not recognized in the core, though we add support to do the overrides there. Hence other users of the JGit library, like the Eclipse plugin and others, will not be affected. GIT_DIR The location of the ".git" directory. GIT_WORK_TREE The location of the work tree. GIT_INDEX_FILE The location of the index file. GIT_CEILING_DIRECTORIES A colon (semicolon on Windows) separated list of paths that which JGit will not cross when looking for the .git directory. GIT_OBJECT_DIRECTORY The location of the objects directory under which objects are stored. GIT_ALTERNATE_OBJECT_DIRECTORIES A colon (semicolon on Windows) separated list of object directories to search for objects. In addition to these we support the core.worktree config setting when the git directory is set deliberately instead of being found. Change-Id: I2b9bceb13c0f66b25e9e3cefd2e01534a286e04c Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | Add support for creating detached headsRobin Rosenberg2009-12-283-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An extra flag when creating a RefUpdate object allows the caller to destroy the symref and replace it with an object ref, a.k.a. detached HEAD. Change-Id: Ia88d48eab1eb4861ebfa39e3be9258c3824a19db Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | Use Constants.OBJECT_ID_STRING_LENGTH instead of LEN * 2Shawn O. Pearce2009-12-287-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | A few locations were doing OBJECT_ID_LENGTH * 2 on their own, as the old STR_LEN constant wasn't visible. Replace them with the new public constant OBJECT_ID_STRING_LENGTH. Change-Id: Id39bddb52de8c65bb097de042e9d4ed99598201f Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | Get rid of a duplicate constant for SHA-1 lengthRobin Rosenberg2009-12-286-28/+32
|/ / | | | | | | | | | | | | | | | | | | Since Constants.OBJECT_ID_LENGTH is a compile time constant we can be sure that it will always be inlined. The same goes for the associated constant STR_LEN which is now refactored to the Constant class and given a name better suited for wider use. Change-Id: I03f52131e64edcd0aa74bbbf36e7d42faaf4a698 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* | Merge change I5b232f67Code Review2009-12-221-2/+2
|\ \ | | | | | | | | | | | | * changes: Fix typo in ReceivePack.java
| * | Fix typo in ReceivePack.javaNico Sallembien2009-12-221-2/+2
| | | | | | | | | | | | | | | | | | The comment indicates that a well-behaved client should not have sent an update for a ref that already exists, but this in a block that corresponds to a create command.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 04:02:16 +0000