Skip to content
Snippets Groups Projects
  1. Mar 13, 2010
    • Shawn Pearce's avatar
      Refactor SideBandInputStream construction · f2dc9f0b
      Shawn Pearce authored
      
      Typically we refer to the raw InputStream (the stream without the
      pkt-line headers on it) as rawIn, and the pkt-line header variant
      as pckIn.  Refactor our fields to reflect that.  To ensure these
      are actually the same underlying InputStream, we now create our own
      PacketLineIn wrapper around the supplied raw InputStream.  Its a
      very low-cost object since it has only the 4 byte length buffer.
      
      Instead of hardcoding the header length as 5, use the constant from
      SideBandOutputStream.  This makes it a bit more clear what we are
      consuming, exactly here.
      
      Change-Id: Iebd05538042913536b88c3ddc3adc3a86a841cc5
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      f2dc9f0b
    • Shawn Pearce's avatar
      Refactor SideBandOutputStream to be buffered · 0af5944c
      Shawn Pearce authored
      
      Instead of relying on our callers to wrap us up inside of a
      BufferedOutputStream and using the proper block sizing, do the
      buffering directly inside of SideBandOutputStream.  This ensures
      we don't get large write-throughs from BufferedOutputStream that
      might overflow the configured packet size.
      
      The constructor of SideBandOutputStream is also beefed up to check
      its arguments and ensure they are within acceptable ranges for the
      current side-band protocol.
      
      Change-Id: Ic14567327d03c9e972f9734b8228178bc448867d
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      0af5944c
  2. Feb 11, 2010
    • Shawn Pearce's avatar
      Don't doubly wrap TransportException in smart HTTP client · dd931bd9
      Shawn Pearce authored
      
      If the readAdvertisedRefs() method throws an exception, its already
      closed the connection and wrapped the underlying cause inside of a
      suitable TransportException object that it is throwing.  We shouldn't
      catch IOException and rethrow a wrapped copy here, because we'll double
      wrap the exception thrown by readAdvertisedRefs.  This may obsecure the
      root cause of the connection failure from the end-user.
      
      Change-Id: I0ca61560f9888c666323dac8a5582aab25e897ff
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      dd931bd9
  3. Feb 10, 2010
  4. Feb 08, 2010
  5. Feb 04, 2010
    • Robin Rosenberg's avatar
      Intermediate workaround for JGit's lack of core.autocrlf support · 23827fef
      Robin Rosenberg authored
      
      Windows users by default have core.autocrlf set to true. JGit
      does not recognize the flags and thus works as if it is set. In order
      to make JGit more compatible with msysgit we set the flag to false
      in repositories that JGit creates.
      
      Bug: 301775
      Change-Id: I7ea462fe3516e5060b87aa1f7ed63689936830c2
      Signed-off-by: default avatarRobin Rosenberg <robin.rosenberg@dewire.com>
      23827fef
    • Shawn Pearce's avatar
      Use keep(1) instead of add() when skipping an entry · 76b98230
      Shawn Pearce authored
      Doing a keep call with a length of 1 will copy the current entry just
      like the previous add was doing, but it avoids doing any validation
      on the entry.  This is sane because the entry can be assumed to be
      already valid, since its originating from the destination index.
      
      Change-Id: I250d902fc98580444af1ba4b8fedceb654541451
      Originally: http://thread.gmane.org/gmane.comp.version-control.git/128214/focus=128213
      
      
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      76b98230
    • Shawn Pearce's avatar
      Don't allow DirCacheEntry with mode of 0 · 29b8fa84
      Shawn Pearce authored
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      CC: Adam W. Hawks <awhawks@writeme.com>
      29b8fa84
    • Shawn Pearce's avatar
      Disallow creating invalid DirCacheEntry records · 329abf72
      Shawn Pearce authored
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      CC: Adam W. Hawks <awhawks@writeme.com>
      329abf72
  6. Feb 03, 2010
  7. Feb 02, 2010
    • Shawn Pearce's avatar
      Micro-optimize CanonicalTreeParser next() for ObjectWalk · 0e137c4d
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      0e137c4d
    • Shawn Pearce's avatar
      Fix ObjectWalk corruption when skipping over empty trees · db54736e
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      db54736e
    • Shawn Pearce's avatar
      Ensure the tree parser resets in ObjectWalk · 0d94a5ca
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      0d94a5ca
    • Shawn Pearce's avatar
      Correct ObjectWalk error message when bad object is found · 986d616e
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      986d616e
    • Shawn Pearce's avatar
      Correctly skip over unrecognized optional dircache extensions · 784b24dd
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      784b24dd
    • Shawn Pearce's avatar
      Remove RepositoryTestCase from DirCacheCGitCompatabilityTest · 434e7884
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      434e7884
    • Christian Halstrick's avatar
      Fix .classpath to make jgit easily runnable from inside eclipse · d9fc01b8
      Christian Halstrick authored
      
      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: default avatarChristian Halstrick <christian.halstrick@sap.com>
      d9fc01b8
  8. Feb 01, 2010
  9. Jan 29, 2010
  10. Jan 28, 2010
  11. Jan 27, 2010
  12. Jan 25, 2010
    • Shawn Pearce's avatar
      Fix racy HTTP tests by waiting for requests to finish · f2d5187e
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      f2d5187e
    • Shawn Pearce's avatar
  13. Jan 24, 2010
    • Shawn Pearce's avatar
      Don't confuse empty configuration variables with booleans · 869c8434
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      869c8434
  14. Jan 23, 2010
    • Shawn Pearce's avatar
      Disable the JRE HTTP cache, if any · e905d93f
      Shawn Pearce authored
      
      We don't want to use the JRE cache when fetching content.
      
      Change-Id: Id76f3e618967c98ed4fbc47a1a2a9e77acbe41ab
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      e905d93f
    • Shawn Pearce's avatar
      Check for remote server exec failures and report · 08a77c04
      Shawn Pearce authored
      
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      08a77c04
    • Shawn Pearce's avatar
      Relax ObjectChecker to permit missing tagger lines · 7c82df11
      Shawn Pearce authored
      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: default avatarShawn O. Pearce <spearce@spearce.org>
      7c82df11
Loading