Skip to content
Snippets Groups Projects
  1. Mar 11, 2010
    • Shawn Pearce's avatar
      pgm: Report not in git repository rather than NPE · 6c64148f
      Shawn Pearce authored
      
      If we can't find a Git repository after searching all the way up
      to the filesystem root, JGit threw an NPE because we tried to get
      the path of null.
      
      Change-Id: I4e42364aeba53993c0ea528a9aeba3f08c7b3321
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      Reviewed-by: default avatarRobin Rosenberg <robin.rosenberg@dewire.com>
      6c64148f
    • Saša Živkov's avatar
      Provide NLS support in JGit. · 2ae9a850
      Saša Živkov authored
      
      The support for NLS relies on java.util API to load a standard
      ResourceBundle and then uses java reflection API to inject localized
      strings into public String fields of the corresponding instance
      of TranslationBundle.
      
      Locale setting is supported per thread to enable concurrent threads
      to use different locales. This is useful when JGit runs in a server
      context where (error) messages might need to differ per-request to
      suit the user's preference.
      
      Change-Id: Ie0e63a0d7bb74eaad495dbe8248595d8a3a76883
      Signed-off-by: default avatarSasa Zivkov <sasa.zivkov@sap.com>
      2ae9a850
  2. Mar 10, 2010
  3. Mar 08, 2010
    • Matthias Sohn's avatar
      Script to fix license headers and copyrights in Java sources · 57822587
      Matthias Sohn authored
      
      The script merges explicit copyright statements in all Java
      sources with author information from git history, updates the
      copyright headers accordingly, and updates the license headers
      to EDL.  For recognized copyright formats see the test data in
      tools/fix-headers.tst.
      
      To fix headers only in the current working directory:
      
        ./tools/fix-headers.pl
      
      To fix the headers for all revisions (don't do this if you don't
      understand the implications of rewriting history) run:
      
        ./tools/rewrite-history.sh
      
      Authors are mapped to employer copyright statements through a
      hardcoded table in the top of the script.  This is a crude but
      simple way to list date ranges under which certain changes need
      to be attributed to copyright holders other than the author.
      
      Change-Id: I654d758658cded02d91324c385f336bcc57fd85f
      Signed-off-by: default avatarMatthias Sohn <matthias.sohn@sap.com>
      Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
      57822587
  4. Feb 17, 2010
  5. Feb 12, 2010
  6. Feb 11, 2010
    • Nico Sallembien's avatar
      Allow users of ReceivePack access to the objects being sent · 19126f70
      Nico Sallembien authored
      When implementing branch read access, we need to prove that the
      newly created reference(s) point to objects that the user can see.
      
      There are two ways that an object is reachable:
      1)  It's reachable from a branch or change the user can see
      2)  It was uploaded as part of the pack file the user sent us
      
      This change adds additional methods in ReceivePack that will allow a
      server to check the above conditions, in order to ensure that a user
      is not trying to create a reference that they cannot see, or that a
      malicious user isn't attempting to forge the SHA-1 of an object that
      they cannot see in order to base a change off of it.
      
      Change-Id: Ieba75b4f0331e06a03417c37f4ae1ebca4fbee5a
      19126f70
    • 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
  7. Feb 10, 2010
  8. Feb 08, 2010
  9. 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
  10. Feb 03, 2010
  11. 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
  12. Feb 01, 2010
  13. Jan 29, 2010
  14. Jan 28, 2010
  15. Jan 27, 2010
Loading