Skip to content
Snippets Groups Projects
  1. Apr 27, 2010
    • Shawn Pearce's avatar
      Favor earlier PackFile instances over later duplicates · a0a52897
      Shawn Pearce authored
      
      There is a potential race condition during insertPack that can lead
      to us having the same pack file open twice in the same directory.
      
      A different thread can miss an object on disk, and trigger a scan
      of the directory, and notice the pack that was put in by IndexPack.
      So the pack winds up in the newly created PackList.
      
      The IndexPack thread then wakes up and finishes its insertPack by
      creating a new PackFile and inserting it into position 0 of the list.
      We now have the same pack listed twice.
      
      Readers will favor the earlier PackFile instance, because its the
      first one they come across as they iterate through the list.
      
      Keep that earlier one when we scan the pack directory again, as
      this will avoid needing to purge out all of the windows that may
      have been cached.
      
      Of course we should also fix that race condition, but this block
      was taking the wrong resolution if this error ever shows up, so
      lets first fix the block to use a more sane resolution.
      
      Change-Id: I0d339b9fd1dd8012e8fe5a564b893c0f69109e28
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      a0a52897
    • Shawn Pearce's avatar
      Cleanup duplicated object reuse code in PackWriter · eeed0abd
      Shawn Pearce authored
      
      This reuse line was identical between the two branches related to
      reusing a delta, or reusing a whole object.  Either way they reuse
      the body of the object as-is.  So just make that a common function
      after the header is written.
      
      Change-Id: I0e6673b8e813c8c08c594ea2ba546fd366339d5d
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      eeed0abd
  2. Apr 24, 2010
  3. Apr 23, 2010
    • Shawn Pearce's avatar
      Fix NPE during InflaterCache return after corrupt loose object · dafa8fbf
      Shawn Pearce authored
      
      If a corrupt loose object is read, UnpackedObjectLoader was disposing
      of the Inflater, and then attempting to return the disposed Inflater
      to the InflaterCache.  Since the disposed Inflater had its native
      libz resource deallocated and its reference cleared out, the Inflater
      threw NullPointerException and refused to reset itself before being
      put back into the cache.
      
      Instead of disposing of the Inflater when corruption is found, do
      nothing, and allow it to be returned to the cache.  The instance
      will get reset, and should be usable by a future caller.
      
      Bug: 310291
      Change-Id: I44f2247c08b6e04fa62f8399609341b07508c096
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      dafa8fbf
  4. Apr 20, 2010
    • Shawn Pearce's avatar
      Merge branch 'receive-pack-filter' · f36df5dc
      Shawn Pearce authored
      * receive-pack-filter:
        ReceivePack: Clarify the check reachable option
        ReceivePack: Micro-optimize object lookup when checking connectivity
        ReceivePack: Correct type of not provided object
        IndexPack: Tighten up new and base object bookkeeping
        ReceivePack: Remove need new,base object id properties
        ReceivePack: Discard IndexPack as soon as possible
        ReceivePack: fix ensureProvidedObjectsVisible on thin packs
      
      Change-Id: I4ef2fcb931f3219872e0519abfcee220191d5133
      f36df5dc
  5. Apr 17, 2010
    • Matthias Sohn's avatar
    • Matthias Sohn's avatar
      f1be93eb
    • Robin Rosenberg's avatar
    • Shawn Pearce's avatar
      ReceivePack: Clarify the check reachable option · 585dcb7a
      Shawn Pearce authored
      
      This option was mis-named from day 1.  Its not checking that the
      objects provided by the client are reachable, its actually doing
      a scan to prove that objects referenced by the client are already
      reachable through another reference on the server, or were sent
      as part of the pack from the client.
      
      Rename it checkReferencedObjectsAreReachable, since we really are
      trying to validate that objects referenced by the client's actions
      are reachable to the client.
      
      We also need to ensure we run checkConnectivity() anytime this is
      enabled, even if the caller didn't turn on fsck for object formats.
      Otherwise the check would be completely bypassed.
      
      Change-Id: Ic352ddb0ca8464d407c6da5c83573093e018af19
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      585dcb7a
    • Shawn Pearce's avatar
      ReceivePack: Micro-optimize object lookup when checking connectivity · a7702050
      Shawn Pearce authored
      
      If we are checking the visibility of everything referenced in the
      pack that isn't already reachable by a reference, it needs to be
      in the provided set.  Since the provided set lists everything that
      is in this pack, we can avoid checking to see if the blob exists
      on disk, because we know it should be there, it was found in the
      pack we just consumed.
      
      Change-Id: Ie3c7746f734d13077242100a68e048f1ac18c34a
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      a7702050
    • Shawn Pearce's avatar
      ReceivePack: Correct type of not provided object · 6029bb24
      Shawn Pearce authored
      
      If a tree was referenced but not provided in the pack, report it
      as a missing tree and not as a missing blob.
      
      Change-Id: Iab05705349cdf0d30cc3f8afc6698a8d2a941343
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      6029bb24
    • Shawn Pearce's avatar
      IndexPack: Tighten up new and base object bookkeeping · 2bb8defa
      Shawn Pearce authored
      
      The only current consumer of these collections is ReceivePack,
      where it needs to test ObjectId equality between a RevObject and an
      ObjectId.  There we were copying from a traditional HashSet<ObjectId>
      into an ObjectIdSubclassMap<ObjectId>, as the latter can perform
      hashing using ObjectId's native value support, bypassing RevObject's
      override on hashCode() and equals().  Instead of doing that copy,
      directly create ObjectIdSubclassMap instances inside of ReceivePack.
      
      We also only need to record the objects that do not appear in the
      incoming pack, and were therefore copied from the local repositiory
      in order to complete delta resolution.  Instead of listing everything
      that used an OBJ_REF_DELTA format, list only the objects that we
      pulled from the destination repository via a normal ObjectLoader.
      
      ReceivePack can now discard the IndexPack object, and all of its
      other data, as soon as these collections are held by the check
      connectivity method.  This frees up memory for the ObjectWalk's
      own RevObject pool.
      
      Change-Id: I22ef71b45c2045a0202e7fd550a770ee1f6f38a6
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      2bb8defa
  6. Apr 16, 2010
    • Shawn Pearce's avatar
      ReceivePack: Remove need new,base object id properties · 329a0e16
      Shawn Pearce authored
      
      These are more like internal implementation details of how IndexPack
      works with ReceivePack to validate the incoming object stream.
      Callers who are embedding the ReceivePack logic in their own
      application don't really need to know the details of which objects
      were used for delta bases in the incoming thin pack, or exactly
      which objects were newly transmitted.
      
      Hide these from the API, as exposing them through ReceivePack was
      an early mistake.
      
      Change-Id: I7ee44a314fa19e6a8520472ce05de92c324ad43e
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      329a0e16
    • Shawn Pearce's avatar
      ReceivePack: Discard IndexPack as soon as possible · 8279361d
      Shawn Pearce authored
      
      The IndexPack object carries a good bit of state within itself about
      the objects received over the wire.  The earlier we can discard it,
      the sooner the GC is able to reclaim this chunk of memory for other
      uses.  So drop it as soon as we are certain the pack is valid and we
      have no connectivity concerns.
      
      Change-Id: I1e8bc87c2e9183733043622237a064e55957891f
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      8279361d
    • Shawn Pearce's avatar
      ReceivePack: fix ensureProvidedObjectsVisible on thin packs · 7a91b180
      Shawn Pearce authored
      
      If ensureProvidedObjectsVisible is enabled we expected any trees or
      blobs directly reachable from an advertised reference to be marked
      with UNINTERESTING.  Unfortunately ObjectWalk doesn't bother setting
      this until the traversal is complete.  Even then it won't necessarily
      set it on every tree if the corresponding commit wasn't popped.
      
      When we are going to check the base objects for the received pack,
      ensure the UNINTERESTING flag gets carried into every immediately
      reachable tree or blob, because these are the ones that the client
      might try to use as delta bases in a thin pack.
      
      Change-Id: I5d5fdcf07e25ac9fc360e79a25dff491925e4101
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      7a91b180
    • Shawn Pearce's avatar
      ObjectIdSubclassMap: Correct Iterator to throw NoSuchElementException · 466bec3c
      Shawn Pearce authored
      
      The Iterator contract says next() shall throw NoSuchElementException
      if there are no more items remaining in the iteration.  We got this
      wrong when I originally wrote the implementation, so fix it.
      
      Change-Id: Iea25e6569ead5c8b3128b8a368c5b2caebec7ecc
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      466bec3c
    • Shawn Pearce's avatar
      ObjectIdSubclassMap: Add isEmpty() method · 4cc7b1c5
      Shawn Pearce authored
      
      This class behaves like a cross between a Set and a Map, sometimes
      we might expect to use the method isEmpty() to test for size() == 0.
      So implement it, reducing the surprise folks get when they are given
      one of these objects.
      
      Change-Id: I0d68e1243da8e62edf79c6ba4fd925f643e80a88
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      4cc7b1c5
    • Shawn Pearce's avatar
      IndexPack: Correct thin pack fix using less than 20 bytes · 06ee913c
      Shawn Pearce authored
      
      If we need to append less than 20 bytes in order to fix a thin pack
      and make it complete, we need to set the length of our file back to
      the actual number of bytes used because the original SHA-1 footer was
      not completely overwritten.  That extra data will confuse the header
      and footer fixup logic when it tries to read to the end of the file.
      
      This isn't a very common case to occur, which is why we've never
      seen it before.  Getting a delta that requires a whole object which
      uses less than 20 bytes in pack representation is really hard.
      Generally a delta generator won't make these, because the delta
      would be bigger than simply deflating the whole object.  I only
      managed to do this with a hand-crafted pack file where a 1 byte
      delta was pointed to a 1 byte whole object.
      
      Normally we try really hard to avoid truncating, because its
      typically not safe across network filesystems.  But the odds of
      this occurring are very low.  This truncation is done on a file
      we have open for writing, will append more content onto, and is
      a temporary file that we won't move into position for others to
      see until we've validated its SHA-1 is sane.  I don't think the
      truncate on NFS issue is something we need to worry about here.
      
      Change-Id: I102b9637dfd048dc833c050890d142f43c1e75ae
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      06ee913c
  7. Apr 15, 2010
    • Shawn Pearce's avatar
      Fix unit tests using MockSystemReader with user configuation · 5c780b38
      Shawn Pearce authored
      
      Since cc905e7d "Make Repository.getConfig aware of changed config"
      its invalid to have a null result from FileBasedConfig.getFile(), as
      the path is used to stat the location on disk before returning the
      Config object from Repository.getConfig().
      
      Mock out the isOutdated() method to return false all of the time
      in the mock test environment, so we don't crash with an NPE when
      this mock user configuration is being called.
      
      Change-Id: I0b4d9cbd346d5dc225ec12674da905c35457fa7c
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      5c780b38
  8. Apr 13, 2010
  9. Apr 12, 2010
  10. Apr 11, 2010
  11. Apr 10, 2010
  12. Apr 05, 2010
    • Robin Rosenberg's avatar
      JGit plugin not compatible with Eclipse 3.4 · fa4c3fe4
      Robin Rosenberg authored
      
      The JSch bundle in Eclipse 3.4 does not export its packages with
      version numbers. Use Require-Bundle on version 0.1.37 that comes
      with Eclipse 3.4
      
      There is no 0.1.37 in the maven repositories so the pom still refers
      to 0.1.41 so the build can get the compile time dependencies right.
      
      Bug: 308031
      CQ: 3904 jsch Version: 0.1.37 (using Orbit CQ2014)
      
      Change-Id: I12eba86bfbe584560c213882ebba58bf1f9fa0c1
      Signed-off-by: default avatarRobin Rosenberg <robin.rosenberg@dewire.com>
      fa4c3fe4
  13. Mar 23, 2010
  14. Mar 22, 2010
  15. Mar 21, 2010
    • Shawn Pearce's avatar
      Fix EGit deadlock listing branches of SSH remote · 0dc93a2f
      Shawn Pearce authored
      
      When listing branches, EGit only reads the advertisement and
      then disconnects.  When it closes down the pack channel the remote
      side is waiting for the client to send our list of commands, or a
      flush-pkt to let it know there is nothing to do.
      
      However if an error thread is open watching the SSH stderr stream,
      we ask for it to finish before we send the flush-pkt.  Unfortunately
      the thread won't terminate until the main output stream closes,
      which is waiting for the flush-pkt.  A classic network deadlock.
      
      If the output stream needs a flush-pkt we send it before we wait
      for the error stream to close.  If the flush-pkt is rejected, we
      close down the output stream early, assuming that the remote side
      is broken and we will get error information soon.
      
      Change-Id: I8d078a339077756220c113f49d206b1bf295d434
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      0dc93a2f
    • Shawn Pearce's avatar
      Merge branch 'stable-0.7' · 9285240d
      Shawn Pearce authored
      * stable-0.7:
        Qualify post-0.7.0 builds
        JGit 0.7.0
      
      This is an 'ours' merge to avoid bringing in the 0.7.0 version
      numbers in the manifest and pom files.
      
      Change-Id: Iad6354af57aaa2f233142fbf679489b08c121a71
      9285240d
    • Shawn Pearce's avatar
      Qualify builds as 0.8.0 · 14e469c4
      Shawn Pearce authored
      
      Since the API is changing relative to 0.7.0, we'll call our next
      release 0.8.1.  But until that gets released, builds from master
      will be 0.8.0.qualifier.
      
      Change-Id: I921e984f51ce498610c09e0db21be72a533fee88
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      14e469c4
    • Shawn Pearce's avatar
      Merge branch 'stable-0.7' · 624572b6
      Shawn Pearce authored
      * stable-0.7:
        tools/version.sh: Update OSGi manifest files
        Drop CQ 3448 from IP log
      
      Change-Id: I8d78d27c48c16a70078bf76b255f8ade8e94db2a
      624572b6
    • Shawn Pearce's avatar
      Qualify post-0.7.0 builds · 7182fbc4
      Shawn Pearce authored
      
      Change-Id: I5afdc624b28fab37b28dd2cc71d334198672eef3
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      7182fbc4
  16. Mar 19, 2010
Loading