summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't allow DirCacheEntry with mode of 0Shawn O. Pearce2010-02-0311-27/+118
| | | | | | | | | | | | | | | | | | | | | | | A 0 file mode in a DirCacheEntry is not a valid mode. To C git such a value indicates the record should not be present. We already were catching this bad state and exceptioning out when writing tree objects to disk, but we did not fail when writing the dircache back to disk. This allowed JGit applications to create a dircache file which C git would not like to read. Instead of checking the mode during writes, we now check during mutation. This allows application bugs to be detected sooner and closer to the cause site. It also allows us to avoid checking most of the records which we read in from disk, as we can assume these are formatted correctly. Some of our unit tests were not setting the FileMode on their test entry, so they had to be updated to use REGULAR_FILE. Change-Id: Ie412053c390b737c0ece57b8e063e4355ee32437 Originally: http://thread.gmane.org/gmane.comp.version-control.git/128214/focus=128213 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> CC: Adam W. Hawks <awhawks@writeme.com>
* Disallow creating invalid DirCacheEntry recordsShawn O. Pearce2010-02-032-1/+175
| | | | | | | | | | | | | | | | | | | | | A dircache record must not use a path string like "/a" or "a//b" as this results in a tree entry being written with a zero length name component in the record. C git does not support an empty name, and neither does any modern filesystem. A record also must not have a stage outside of the standard 0-3 value range, as there are only 2 bits of space available in the on-disk format of the record to store the stage information. Any other values would be truncated into this space, storing a different value than the caller expected. If an application tries to create a DirCache record with either of these wrong values, we abort with an IllegalArgumentException. Change-Id: I699de149efdfccd85d8adde07d3efd080e3b49c2 Originally: http://thread.gmane.org/gmane.comp.version-control.git/128214 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> CC: Adam W. Hawks <awhawks@writeme.com>
* Merge "Ensure RawText closes the FileInputStream when read is complete"Robin Rosenberg2010-02-031-14/+2
|\
| * Ensure RawText closes the FileInputStream when read is completeShawn O. Pearce2010-02-031-14/+2
| | | | | | | | | | | | | | | | | | | | | | Rather than implementing the file reading logic ourselves, and wind up leaking the FileInputStream's file descriptor until the next GC, use IO.readFully(File) which wraps the read loop inside of a try/finally to ensure the stream is closed before it exits. Change-Id: I85a3fe87d5eff88fa788962004aebe19d2e91bb4 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Reviewed-by: Roland Grunberg <rgrunber@redhat.com>
* | Adding some Eclipse-related legal files to JGitChris Aniszczyk2010-02-034-0/+89
| |
* | Cleanup OSGi Import-Package specifications to use versionsShawn O. Pearce2010-02-029-104/+104
|/ | | | | | | | | Actually set the range of versions we are willing to accept for each package we import, lest we import something in the future that isn't compatible with our needs. Change-Id: I25dbbb9eaabe852631b677e0c608792b3ed97532 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Micro-optimize CanonicalTreeParser next() for ObjectWalkShawn O. Pearce2010-02-021-8/+14
| | | | | | | | | | ObjectWalk is invoking next() for each record we consider in a tree. Rather than doing several method calls against the current parser, and testing if we are at eof() at least twice per next() invocation, do it only once and inline the logic to move the parser forward. Change-Id: If5938f5d7b3ca24f500a184c9bd2ef193015414e Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Fix ObjectWalk corruption when skipping over empty treesShawn O. Pearce2010-02-022-18/+67
| | | | | | | | | | | | | | | | | | | The supplied test case comes out of the example tree identified by Robert de Wilde and Ilari on #git: $ git ls-tree -rt a54f1a85ebf6a7f53aa60a45a1be33f8b078fb7e 040000 tree bfe058ad536cdb12e127cde63b01472c960ea105 A 040000 tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904 A/A 040000 tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904 A/B 100644 blob abbbfafe3129f85747aba7bfac992af77134c607 B In this tree, "B" was being skipped because "A/A" as an empty tree was immediately followed by "A/B", also an empty tree, but the ObjectWalk broke out too early and never visited "B". Bug: 286653 Change-Id: I25bcb0bc99d0cbbbdd9c2bd625ad6a691a6d0335 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Ensure the tree parser resets in ObjectWalkShawn O. Pearce2010-02-021-0/+2
| | | | | | | | | | | During dispose() or reset() we are suppose to be restoring the ObjectWalk instance back to the original pre-walk state, but we failed to reset the tree parser. This can lead to confusing state if the ObjectWalk was reused by the caller, as entries from the old walk might be reported as part of the new walk. Change-Id: I6237bae7bfd3794e8b9a92b4dd475559cc72e634 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Correct ObjectWalk error message when bad object is foundShawn O. Pearce2010-02-021-3/+3
| | | | | | | | Instead of including "ObjectId[SHA-1]" in the message, just us the formatted SHA-1 name of the object by calling name(). Change-Id: I0d1d0e8207f8a3f02188e60242e4e9bf7420e88f Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Correctly skip over unrecognized optional dircache extensionsShawn O. Pearce2010-02-025-11/+70
| | | | | | | | | | | | | | | | | | | We didn't skip the correct number of bytes when we skipped over an unrecognized but optional dircache extension. We missed skipping the 8 byte header that makes up the extension's name and length. We also didn't include the skipped extension's payload as part of our index checksum, resuting in a checksum failure when the index was done reading. So ensure we always scan through a skipped section and include it in the checksum computation. Add a test case for a currently unsupported index extension, 'ZZZZ', to verify we can still read the DirCache object even though we don't know what 'ZZZZ' is supposed to mean. Bug: 301287 Change-Id: I4bdde94576fffe826d0782483fd98cab1ea628fa Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Remove RepositoryTestCase from DirCacheCGitCompatabilityTestShawn O. Pearce2010-02-021-3/+5
| | | | | | | | | This test doesn't actually depend upon the large data set we have in the RepositoryTestCase, so drop that from the dependency and use the more simple LocalDiskRepositoryTestCase instead. Change-Id: I0fd4affe1dd5ec86e8c3253db42df11d3b612e36 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Fix .classpath to make jgit easily runnable from inside eclipseChristian Halstrick2010-02-021-0/+1
| | | | | | | | | | | When running jgit from inside Eclipse (e.g. rightclick on project org.eclipse.jgit.pgm and select Run as->Java application) no commands are found. This is because the commands are loaded from a resource file /META-INF/services/org.eclipse.jgit.pgm.TextBuiltin and this file is not anymore on the classpath. I fixed this by modifying .classpath to contain the META-INF directory. Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
* Fix server side NPE during push to empty repositoryShawn O. Pearce2010-02-011-1/+1
| | | | | | | | | If the repository is empty, we have no HEAD branch, which means we can't test to see if the HEAD is detached and should be advertised as a .have line. Change-Id: I6e85f836e7db057cede812d0d6c1aecbd6cbe6c5 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Merge "Generate an Eclipse IP log with jgit eclipse-iplog"Shawn Pearce2010-01-2931-9/+2884
|\
| * Generate an Eclipse IP log with jgit eclipse-iplogShawn O. Pearce2010-01-2931-9/+2884
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The new plugin contains the bulk of the logic to scan a Git repository, and query IPZilla, in order to produce an XML formatted IP log for the requested revision of any Git based project. This plugin is suitable for embedding into a servlet container, or into the Eclipse workbench. The command line pgm package knows how to invoke this plugin through the eclipse-iplog subcommand, permitting storage of the resulting log as a local XML file. Change-Id: If01d9d98d07096db6980292bd5f91618c55d00be Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Merge "Check for remote server exec failures and report"Shawn Pearce2010-01-291-16/+40
|\ \ | |/ |/|
| * Check for remote server exec failures and reportShawn O. Pearce2010-01-231-16/+40
| | | | | | | | | | | | | | | | | | | | | | If remote.name.uploadpack or .receivepack is misconfigured and points to a non-existent command on the remote system, we should receive back exit status 127. Report this case specially with the command we used so the user knows what is going. Bug: 293703 Change-Id: I7504e7b6238d5d8e698d37db7411c4817a039d08 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Merge "Add unsetSection to Config to remove an entire block"Robin Rosenberg2010-01-282-0/+83
|\ \
| * | Add unsetSection to Config to remove an entire blockShawn O. Pearce2010-01-292-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | The unsetSection method can be used to delete an entire configuration block, such as a [branch ""] or [remote ""] section in a file. Change-Id: I93390c9b2187eb1b0d51353518feaed83bed2aad Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* | | Merge "Relax ObjectChecker to permit missing tagger lines"Robin Rosenberg2010-01-283-34/+54
|\ \ \ | |/ / |/| |
| * | Relax ObjectChecker to permit missing tagger linesShawn O. Pearce2010-01-233-34/+54
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Annotated tags created with C Git versions before the introduction of c818566 ([PATCH] Update tags to record who made them, 2005-07-14), do not have a "tagger" line present in the object header. This line did not appear in C Git until v0.99.1~9. Ancient projects such as the Linux kernel contain such tags, for example Linux 2.6.12 is older than when this feature first appeared in C Git. Linux v2.6.13-rc4 in late July 2005 is the first kernel version tag to actually contain a tagger line. It is therefore acceptable for the header to be missing, and for the RevTag.getTaggerIdent() method to return null. Since the Javadoc for getTaggerIdent() already explained that the identity may be null, we just need to test that this is true when the header is missing, and allow the ObjectChecker to pass anyway. Change-Id: I34ba82e0624a0d1a7edcf62ffba72260af6f7e5d See: http://code.google.com/p/gerrit/issues/detail?id=399 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Merge "Update the update site URL and corresponding feature.properties."Matthias Sohn2010-01-272-4/+4
|\ \
| * | Update the update site URL and corresponding feature.properties.Matthias Sohn2010-01-272-4/+4
| | | | | | | | | | | | | | | Change-Id: I55b42bca435c538a8c5534c68813568a2188b55b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge "Added caching for loose object lookup during pack indexing"Shawn Pearce2010-01-276-1/+276
|\ \ \ | |/ / |/| |
| * | Added caching for loose object lookup during pack indexingConstantine Plotnikov2010-01-216-1/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows systems, file system lookup is a slow operation, so checking each object if it exists during indexing (after receiving the pack) could take a siginificant time. This patch introduces CachedObjectDirectory that pre-caches lookup results. Bug: 300397 Change-Id: I471b93f9bb3ee173eb37cae1d75e9e4eb49985e7 Signed-off-by: Constantine Plotnikov <constantine.plotnikov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | Fix racy HTTP tests by waiting for requests to finishShawn O. Pearce2010-01-252-26/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the background Jetty threads have been able to write the request log record before the JUnit thread tries to read the set of requests back. This wait is necessary because the JUnit thread may be able to continue as soon as Jetty has finished writing the response onto the socket, and hasn't necessarily finished the post-response logging activity. By using a semaphore with a fixed number of resources, and using one resource per request, but all of them when we want to read the log, we implement a simple lock that requires there be no active requests when we want to get the log from the JUnit thread. Change-Id: I499e1c96418557185d0e19ba8befe892f26ce7e4 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | Merge "Don't confuse empty configuration variables with booleans"Shawn Pearce2010-01-252-4/+34
|\ \ \
| * | | Don't confuse empty configuration variables with booleansShawn O. Pearce2010-01-232-4/+34
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Config was confusing the following two variables when writing the file back to text format: [my] empty = enabled When parsed, we say that my.empty has 1 value, null, and my.enabled is an empty string value that in boolean context should be evaluated as true. Saving this configuration file back to text format was ignoring the null value for my.empty, producing a completely different file than what Config read: [my] empty enabled Instead handle the writing differently to ensure the original format is output. New tests cases cover the expected behavior and return values from accessor methods. Change-Id: Id37379ce20cb27e3330923cf989444dd9f2bdd96 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* / | Disable the JRE HTTP cache, if anyShawn O. Pearce2010-01-231-0/+1
|/ / | | | | | | | | | | | | We don't want to use the JRE cache when fetching content. Change-Id: Id76f3e618967c98ed4fbc47a1a2a9e77acbe41ab Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Correct bundle, provider names to be consistentShawn O. Pearce2010-01-2310-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Technically our project name is "JGit", not "Java Git". In fact there is already another project called "JavaGit" (no space) that we don't want to become confused with. Ensure we always call ourselves "JGit" in user visible assets, like the bundle name. Other Eclipse products list their provider as "Eclipse.org", not "eclipse.org". So list ourselves that way in all of our plugin.properties files. Change-Id: Ibcea1cd6dda2af757a8584099619fc23b7779a84 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Correct indentation in org.eclipse.jgit.packaging/pom.xmlShawn O. Pearce2010-01-231-1/+1
| | | | | | | | | | Change-Id: I45caafbad4daac827f661d38c7f719e9b5511dd4 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Merge "Make HTTP test project work in Eclipse"Shawn Pearce2010-01-237-0/+94
|\ \
| * | 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>
* | | Merge branch 'ref-abstract'Shawn O. Pearce2010-01-2344-1286/+5633
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ref-abstract: Optimize RefAdvertiser performance by avoiding sorting branch: Add -m option to rename a branch Replace writeSymref with RefUpdate.link Rewrite reference handling to be abstract and accurate Create new RefList and RefMap utility types Change-Id: If43aacf5aa4013edbd0a6e84d84c4f9e94de5be0
| * | | Optimize RefAdvertiser performance by avoiding sortingShawn O. Pearce2010-01-234-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't copy and sort the set of references if they are passed through in a RefMap or a SortedMap using the key's natural sort ordering. Either map is already in the order we want to present the items to the client in, so copying and sorting is a waste of local CPU and memory. Change-Id: I49ada7c1220e0fc2a163b9752c2b77525d9c82c1 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | | branch: Add -m option to rename a branchShawn O. Pearce2010-01-231-4/+37
| | | | | | | | | | | | | | | | | | | | Change-Id: I7cf8e43344eaf301592fba0c178e04daad930f9a Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | | Replace writeSymref with RefUpdate.linkShawn O. Pearce2010-01-239-67/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using RefUpdate for symbolic reference creation we can reuse the logic related to updating the reflog with the event, without needing to expose something such as the legacy ReflogWriter class (which we no longer have). Applications using writeSymref must update their code to use the new pattern of changing the reference through the updateRef method: String refName = "refs/heads/master"; RefUpdate u = repository.updateRef(Constants.HEAD); u.setRefLogMessage("checkout: moving to " + refName, false); switch (u.link(refName)) { case NEW: case FORCED: case NO_CHANGE: // A successful update of the reference break; default: // Handle the failure, e.g. for older behavior throw new IOException(u.getResult()); } Change-Id: I1093e1ec2970147978a786cfdd0a75d0aebf8010 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | | Rewrite reference handling to be abstract and accurateShawn O. Pearce2010-01-2339-1241/+3766
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit actually does three major changes to the way references are handled within JGit. Unfortunately they were easier to do as a single massive commit than to break them up into smaller units. Disambiguate symbolic references: --------------------------------- Reporting a symbolic reference such as HEAD as though it were any other normal reference like refs/heads/master causes subtle programming errors. We have been bitten by this error on several occasions, as have some downstream applications written by myself. Instead of reporting HEAD as a reference whose name differs from its "original name", report it as an actual SymbolicRef object that the application can test the type and examine the target of. With this change, Ref is now an abstract type with different subclasses for the different types. In the classical example of "HEAD" being a symbolic reference to branch "refs/heads/master", the Repository.getAllRefs() method will now return: Map<String, Ref> all = repository.getAllRefs(); SymbolicRef HEAD = (SymbolicRef) all.get("HEAD"); ObjectIdRef master = (ObjectIdRef) all.get("refs/heads/master"); assertSame(master, HEAD.getTarget()); assertSame(master.getObjectId(), HEAD.getObjectId()); assertEquals("HEAD", HEAD.getName()); assertEquals("refs/heads/master", master.getName()); A nice side-effect of this change is the storage type of the symbolic reference is no longer ambiguous with the storge type of the underlying reference it targets. In the above example, if master was only available in the packed-refs file, then the following is also true: assertSame(Ref.Storage.LOOSE, HEAD.getStorage()); assertSame(Ref.Storage.PACKED, master.getStorage()); (Prior to this change we returned the ambiguous storage of LOOSE_PACKED for HEAD, which was confusing since it wasn't actually true on disk). Another nice side-effect of this change is all intermediate symbolic references are preserved, and are therefore visible to the application when they walk the target chain. We can now correctly inspect chains of symbolic references. As a result of this change the Ref.getOrigName() method has been removed from the API. Applications should identify a symbolic reference by testing for isSymbolic() and not by using an arcane string comparsion between properties. Abstract the RefDatabase storage: --------------------------------- RefDatabase is now abstract, similar to ObjectDatabase, and a new concrete implementation called RefDirectory is used for the traditional on-disk storage layout. In the future we plan to support additional implementations, such as a pure in-memory RefDatabase for unit testing purposes. Optimize RefDirectory: ---------------------- The implementation of the in-memory reference cache, reading, and update routines has been completely rewritten. Much of the code was heavily borrowed or cribbed from the prior implementation, so copyright notices have been left intact as much as possible. The RefDirectory cache no longer confuses symbolic references with normal references. This permits the cache to resolve the value of a symbolic reference as late as possible, ensuring it is always current, without needing to maintain reverse pointers. The cache is now 2 sorted RefLists, rather than 3 HashMaps. Using sorted lists allows the implementation to reduce the in-memory footprint when storing many refs. Using specialized types for the elements allows the code to avoid additional map lookups for auxiliary stat information. To improve scan time during getRefs(), the lists are returned via a copy-on-write contract. Most callers of getRefs() do not modify the returned collections, so the copy-on-write semantics improves access on repositories with a large number of packed references. Iterator traversals of the returned Map<String,Ref> are performed using a simple merge-join of the two cache lists, ensuring we can perform the entire traversal in linear time as a function of the number of references: O(PackedRefs + LooseRefs). Scans of the loose reference space to update the cache run in O(LooseRefs log LooseRefs) time, as the directory contents are sorted before being merged against the in-memory cache. Since the majority of stable references are kept packed, there typically are only a handful of reference names to be sorted, so the sorting cost should not be very high. Locking is reduced during getRefs() by taking advantage of the copy-on-write semantics of the improved cache data structure. This permits concurrent readers to pull back references without blocking each other. If there is contention updating the cache during a scan, one or more updates are simply skipped and will get picked up again in a future scan. Writing to the $GIT_DIR/packed-refs during reference delete is now fully atomic. The file is locked, reparsed fresh, and written back out if a change is necessary. This avoids all race conditions with concurrent external updates of the packed-refs file. The RefLogWriter class has been fully folded into RefDirectory and is therefore deleted. Maintaining the reference's log is the responsiblity of the database implementation, and not all implementations will use java.io for access. Future work still remains to be done to abstract the ReflogReader class away from local disk IO. Change-Id: I26b9287c45a4b2d2be35ba2849daa316f5eec85d Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | | Create new RefList and RefMap utility typesShawn O. Pearce2010-01-225-3/+1703
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These types can be used by RefDatabase implementations to manage the collection. A RefList stores items sorted by their name, and is an immutable type using copy-on-write semantics to perform modifications to the collection. Binary search is used to locate an existing item by name, or to locate the proper insertion position if an item does not exist. A RefMap can merge up to 3 RefList collections at once during its entry iteration, allowing items in the resolved or loose RefList to override items by the same name in the packed RefList. The RefMap's goal is O(log N) lookup time, and O(N) iteration time, which is suitable for returning from a RefDatabase. By relying on the immutable RefList we might be able to make map construction nearly constant, making Repository.getAllRefs() an inexpensive operation if the caches are current. Since modification is not common, changes require up to O(N + log N) time to copy the internal list and collapse or expand the list's array. As most changes are made to the loose collection and not the packed collection, in practice most changes would require less than the full O(N) time, due to a significantly smaller N in the loose list. Almost complete test coverage is included in the corresponding unit tests. A handful of methods on RefMap are not tested in this change, as writing the proper test depends on a future refactoring of how the Ref class represents symbolic reference names. Change-Id: Ic2095274000336556f719edd75a5c5dd6dd1d857 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | / Use build timestamp as OSGi version qualifierMatthias Sohn2010-01-237-6/+57
| |/ |/| | | | | | | | | | | | | | | | | | | Translate the version qualifier using maven-antrun-plugin since we want manifest-first and currently cannot rely on Tycho for the JGit build. Introduce property for Eclipse p2 repository to enable builds against other Eclipse versions. Change-Id: I62c4e77ae91fe17f56c5a5338d53828d4e225395 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Adding PDE API Tools nature to JGit"Robin Rosenberg2010-01-172-0/+9
|\ \
| * | Adding PDE API Tools nature to JGitChris Aniszczyk2010-01-162-0/+9
| | |
* | | Remove redundant Maven plugin declarations from sub-modulesMatthias Sohn2010-01-162-29/+0
|/ / | | | | | | | | Change-Id: I2aa1b2e2e08108deec051594ca8ac3992e271f0f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge changes Icfe92059,I65a9da89Shawn Pearce2010-01-1516-44/+61
|\ \ | | | | | | | | | | | | | | | * changes: Introduce a named constant for the ".git" directory extension Introduce a named constant for the .git directory.
| * | Introduce a named constant for the ".git" directory extensionRobin Rosenberg2010-01-154-7/+13
| | | | | | | | | | | | | | | Change-Id: Icfe9205994c6810fcd880054a586e9eef29df9a1 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
| * | Introduce a named constant for the .git directory.Robin Rosenberg2010-01-1515-37/+48
| |/ | | | | | | | | | | | | | | | | | | | | Not all occurrences of ".git" are replaced by this constant, only those where it actually refers to the directory with that name, i.e not the ".git" directory suffix. Asserts and comment are also excluded from replacement. Change-Id: I65a9da89aedd53817f2ea3eaab4f9c2bed35d7ee Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* / Maven 3/Tycho build for JGit featureMatthias Sohn2010-01-1517-2/+663
|/ | | | | | | | | | | As discussed on the jgit-dev list here: http://dev.eclipse.org/mhonarc/lists/egit-dev/msg00654.html - Define a separate JGit feature. - As of now create a separate JGit update site and zip it. Change-Id: Ie4026f15f6250c4933dccf6f31b5009b90c036bc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* 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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 22:55:51 +0000