Skip to content
Snippets Groups Projects
  1. Feb 03, 2010
  2. Jan 23, 2010
    • Shawn Pearce's avatar
      Correct bundle, provider names to be consistent · 0238a21b
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      0238a21b
    • Shawn Pearce's avatar
      Optimize RefAdvertiser performance by avoiding sorting · 36f05a9c
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      36f05a9c
    • Shawn Pearce's avatar
      Rewrite reference handling to be abstract and accurate · 01b5392c
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      01b5392c
    • Matthias Sohn's avatar
      Use build timestamp as OSGi version qualifier · 407fe631
      Matthias Sohn authored
      
      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: default avatarMatthias Sohn <matthias.sohn@sap.com>
      407fe631
  3. Jan 12, 2010
    • Shawn Pearce's avatar
      server side: smart fetch over HTTP · 2e521446
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      2e521446
    • Shawn Pearce's avatar
      server side: smart push over HTTP · 81fea92e
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      81fea92e
    • Shawn Pearce's avatar
      Simple dumb HTTP server for Git · 5e33a1de
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      5e33a1de
Loading