Permalink
Switch branches/tags
Nothing to show
Commits on Jun 27, 2011
  1. Fixed Sharpen.HttpURLConnection.Response to handle a thrown WebExcept…

    fealebenpae authored and slluis committed Jun 23, 2011
    …ion when calling HttpWebRequest.GetResponse().
Commits on Jun 10, 2011
  1. Added missing files

    slluis committed Jun 10, 2011
Commits on Jun 7, 2011
  1. Updated from JGit

    slluis committed Jun 7, 2011
    ----------------------------------------------------
    JGit commit f1713abcdcb5097d4e44893862bedc6e27dde20e
    Prepare 1.1.0 builds
    
    Change-Id: I4cf017cd567543846839612ab3ace6d26233e01d
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    
    ----------------------------------------------------
    JGit commit 2a1e20ead5b9333ecf5d299f95ae47321faa678b
    Merge branch 'stable-1.0'
    
    * stable-1.0:
      Prepare post v1.0.0.201106051725-r builds
      JGit v1.0.0.201106051725-r
      Update to eclipse.org's latest SUA
    
    ----------------------------------------------------
    JGit commit 4a4e1f764c7cc1ffe0a86c22db646c4f11785e01
    Prepare post v1.0.0.201106051725-r builds
    
    Change-Id: I4839877e1a6fa7782f37423213af8d579727a494
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    
    ----------------------------------------------------
    JGit commit f65513f75397b1f4de6d063962e5cccca5a89cb6
    JGit v1.0.0.201106051725-r
    
    Change-Id: I39f4a23cf284505395d511dfedf02b7f5608df95
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    
    ----------------------------------------------------
    JGit commit 0636f9cdda2b0172d229ba95bc32dbf86e981cde
    Update to eclipse.org's latest SUA
    
    Change-Id: I0d016ddaed85656c2e680d0bc99829c6ea13b968
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    
    ----------------------------------------------------
    JGit commit f0d62fc609e70200de1a7439cd89059dfe5740b2
    Merge branch 'stable-1.0'
    
    * stable-1.0:
      Prepare post v1.0.0.201106011211-rc3 builds
      JGit v1.0.0.201106011211-rc3
      Remove incubation marker
      blame: Compute the origin of lines in a result file
    
    ----------------------------------------------------
    JGit commit ada903085d1b4ef8c79e3e2d91f49fee7e188f53
    Prepare post v1.0.0.201106011211-rc3 builds
    
    Change-Id: I4dec8eba7e35858aef65fcc10f91fad3fe5b52b9
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    
    ----------------------------------------------------
    JGit commit 81371d385b5f199341226644238b8856f5e6831d
    JGit v1.0.0.201106011211-rc3
    
    Change-Id: I574a05200471c431b3a02ac6ff208dc6aa90f539
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    
    ----------------------------------------------------
    JGit commit f5f1536f3f77160798676e5bd2f8b3c66ad8d72d
    Remove incubation marker
    
    Change-Id: I6018ce0cd3b7c8137e137848fe1f04551b257538
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    
    ----------------------------------------------------
    JGit commit a39045604761f94c40aa8fd7db170c237e8fd64e
    blame: Compute the origin of lines in a result file
    
    BlameGenerator digs through history and discovers the origin of each
    line of some result file.  BlameResult consumes the stream of regions
    created by the generator and lays them out in a table for applications
    to display alongside of source lines.
    
    Applications may optionally push in the working tree copy of a file
    using the push(String, byte[]) method, allowing the application to
    receive accurate line annotations for the working tree version.  Lines
    that are uncommitted (difference between HEAD and working tree) will
    show up with the description given by the application as the author,
    or "Not Committed Yet" as a default string.
    
    Applications may also run the BlameGenerator in reverse mode using the
    reverse(AnyObjectId, AnyObjectId) method instead of push().  When
    running in the reverse mode the generator annotates lines by the
    commit they are removed in, rather than the commit they were added in.
    This allows a user to discover where a line disappeared from when they
    are looking at an older revision in the repository.  For example:
    
      blame --reverse 16e810b2..master -L 1080, org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/RefDirectoryTest.java
               (                                              1080)   }
      2302a6d3 (Christian Halstrick 2011-05-20 11:18:20 +0200 1081)
      2302a6d3 (Christian Halstrick 2011-05-20 11:18:20 +0200 1082)   /**
      2302a6d3 (Christian Halstrick 2011-05-20 11:18:20 +0200 1083)    * Kick the timestamp of a local file.
    
    Above we learn that line 1080 (a closing curly brace of the prior
    method) still exists in branch master, but the Javadoc comment below
    it has been removed by Christian Halstrick on May 20th as part of
    commit 2302a6d3.  This result differs considerably from that of C
    Git's blame --reverse feature.  JGit tells the reader which commit
    performed the delete, while C Git tells the reader the last commit
    that still contained the line, leaving it an exercise to the reader
    to discover the descendant that performed the removal.
    
    This is still only a basic implementation.  Quite notably it is
    missing support for the smart block copy/move detection that the C
    implementation of `git blame` is well known for.  Despite being
    incremental, the BlameGenerator can only be run once.  After the
    generator runs it cannot be reused.  A better implementation would
    support applications browsing through history efficiently.
    
    In regards to CQ 5110, only a little of the original code survives.
    
    CQ: 5110
    Bug: 306161
    Change-Id: I84b8ea4838bb7d25f4fcdd540547884704661b8f
    Signed-off-by: Kevin Sawicki <kevin@github.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 8b8ad75ada9d90f8b26e69ca04d4bf512bf43dd4
    Fix a complicated multi level nested if block structure to use a single level with multiple returns.
    
    Change-Id: I3f116f37045e83aba5c80d45b987ab075502dcc6
    
    ----------------------------------------------------
    JGit commit 690c268c793bfc218982130fbfc25870f292295e
    Merge branch 'stable-1.0'
    
    * stable-1.0:
      DHT: Support removing a repository name
      DHT: Fix thread-safety issue in AbstractWriteBuffer
      jgit.sh: Implement pager support
      Change EditList to extend ArrayList
      Ensure the HTTP request is fully consumed
      Make sure test repositories are closed
      Fix CloneCommand not to fetch into remote tracking branches when bare
      Update Eclipse IP log for 1.0
    
    Change-Id: I6340d551482e1dda01f82496296d2038b07fa68b
    
    ----------------------------------------------------
    JGit commit 50f236aff861ab2a6851eb96cff6fe07b775bb5b
    DHT: Support removing a repository name
    
    The first step to deleting a repository from the DHT storage is to
    remove the name binding in the RepositoryIndexTable, making the
    repository unavailable for lookup.
    
    Change-Id: I469bf92f4bf2f555a15949569b21937c14cb142b
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 042a66fe8c2feef7b831b1999b8cd6e9a0181944
    DHT: Fix thread-safety issue in AbstractWriteBuffer
    
    There is a data corruption issue with the 'running' list if a
    background thread schedules something onto the buffer while the
    application thread is also using it.
    
    Change-Id: I5ba78b98b6632965d677a9c8f209f0cf8320cc3d
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 0a39fb2ab65dfdbfbf8022cfdfc3975eba7ac6f2
    jgit.sh: Implement pager support
    
    If the command is either `diff` or `log`, there is often a lot of
    lines of output. Run these commands through $GIT_PAGER, $PAGER, or
    `less` in order to make it easier to browse the output on a terminal.
    
    Change-Id: I18b87ea4acf404b94788f2ac2101812bd13e6a0f
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 8d1ac7a769b3fc4725537376e0e14d3b96ebbe3d
    Change EditList to extend ArrayList
    
    There is no reason for this type to contain an ArrayList and try to
    hide the implementation. It only slows down execution by adding an
    extra layer of method dispatch to each invocation.
    
    Instead subclass from ArrayList.
    
    Change-Id: Ifbb9c7060c2fe3d5a7397c1aa85fbade14088637
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 67a1a0993f3969357c554b2030cfd794b3c3af89
    Ensure the HTTP request is fully consumed
    
    Some servlet containers require the servlet to read the EOF marker
    from the input stream before a response can be output if the stream
    is using "Transfer-Encoding: chunked"... which is typical for any
    sort of large push to a repository over smart HTTP.
    
    Ensure the EOF is always read by the PackParser when it is handling
    the stream, and fail fast if there is more data present than expected
    since this does indicate a protocol error.
    
    Also ensure the EOF is read by UploadPack before it starts to output
    a partial response using packing progress meters.
    
    Change-Id: I131db9dea20b2324cb7c3272a814f21296bc64bd
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit c1525e2aa5e444a2a234de27d6b7189d5d7f715e
    Make sure test repositories are closed
    
    Some repositories created during tests are not added to the 'toClose'
    list in LocalDiskRepositoryTestCase. Therefore when the tests end
    we may have open FileHandles and on Windows this may cause the
    tests to fail because we can't delete those files.
    
    This is fixed by adding the possibility to explicitly add
    repositories to the list of repos which are closed automatically.
    
    Change-Id: I1261baeef4c7d9aaedd7c34b546393bfa005bbcc
    Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
    
    ----------------------------------------------------
    JGit commit cc2197ed9c3be35c875c8316f17a2d6e8d338c88
    Fix CloneCommand not to fetch into remote tracking branches when bare
    
    When cloning into a bare repository we should not create remote
    tracking branches (e.g refs/remotes/origin/testX). Branches of the
    remote repository should but fetched into into branches of the same
    name (e.g refs/heads/testX). Also add the noCheckout option which
    would prevent checkout after fetch.
    
    Change-Id: I5d4cc0389f3f30c53aa0065f38119af2a1430909
    Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
    
    ----------------------------------------------------
    JGit commit cc319fff0db7e23e244fe650f4102150da5633d5
    Merge 'Fix usage of FileSnapshot in RefDirectory' into stable-1.0
    
    * commit '475461d05266fe13b05bc2c6645b9ef928521b4c':
      Fix usage of FileSnapshot in RefDirectory
    
    Change-Id: Ie65bd8b36f4c6a91602a94e9b54a04a4fb335897
    
    ----------------------------------------------------
    JGit commit b04be9334494640a693ef5e515af1be4a6983eb5
    CleanCommand: add the ability to do a dry run
    
    Change-Id: I7b81a7e34a771951e2e7b789b080b2bfb8656e5c
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit a00b951323b0d23482a25b2bb813a56fad7f935b
    Merge "Fix GitConstructionTest teardown"
    ----------------------------------------------------
    JGit commit 475461d05266fe13b05bc2c6645b9ef928521b4c
    Fix usage of FileSnapshot in RefDirectory
    
    RefDirectory was not using FileSnapshot correctly in all places. This
    is fixed with this commit. Additionally the constructors for the
    different types of refs have been changed to take a FileSnapshot
    instead of a modification time.
    
    Change-Id: Ifb6a59e87e8b058a398c38cdfb9d648f0bad4bf8
    Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
    
    ----------------------------------------------------
    JGit commit 802f84650d1930cfdd44f87ba66f32dde722124d
    Fix GitConstructionTest teardown
    
    The teardown faile on Windows because the repos were not closed.
    
    Change-Id: I16cf5645558680029682f898386b061796948237
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    ----------------------------------------------------
    JGit commit d203485780a039b0a65293a7c9bfc1e51e6413a7
    Update Eclipse IP log for 1.0
    
    CQ "4876" is jgit's CQ for usage of protobuf, CQ "5135"
    is the corresponding Orbit CQ.
    
    Change-Id: I300cf2b5758c7da9c18494325f2f38bb3744e459
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    
    ----------------------------------------------------
    JGit commit 03a6f572b5968dc8f77b5c85e3097448df6ea27e
    Merge "Use the stored password instead of prompting for it all the time"
    ----------------------------------------------------
    JGit commit b8c508e54d64628660aa0d907b37a9648923c1f5
    DHT: Add sequence RefData
    
    RefData now uses a sequence number as part of the field, ensuring
    that updates always increase the sequence number by one whenever
    a reference is modified.
    
    Attaching a sequence number to RefData will help with storing
    reference log entries during updates. As the sequence number should
    be unique within the reference name space, log entries can be keyed
    by the sequence number and remain unique.  Making this work over
    reference delete-create cycles will require an additional RefTable
    API to return the oldest sequence number previously used in the
    reference log to seed the recreated reference.
    
    Change-Id: I11cfff2a96ef962e57f29925a3eef41bdbf9f9bb
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 6ec6169215eb33683728c583e231eb5fe9617813
    DHT: Replace TinyProtobuf with Google Protocol Buffers
    
    The standard Google distribution of Protocol Buffers in Java is better
    maintained than TinyProtobuf, and should be faster for most uses.  It
    does use slightly more memory due to many of our key types being
    stored as strings in protobuf messages, but this is probably worth the
    small hit to memory in exchange for better maintained code that is
    easier to reuse in other applications.
    
    Exposing all of our data members to the underlying implementation
    makes it easier to develop reporting and data mining tools, or to
    expand out a nested structure like RefData into a flat format in a SQL
    database table.
    
    Since the C++ `protoc` tool is necessary to convert the protobuf
    script into Java code, the generated files are committed as part of
    the source repository to make it easier for developers who do not have
    this tool installed to still build the overall JGit package and make
    use of it.  Reviewers will need to be careful to ensure that any edits
    made to a *.proto file come in a commit that also updates the
    generated code to match.
    
    CQ: 5135
    Change-Id: I53e11e82c186b9cf0d7b368e0276519e6a0b2893
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 7cad0adc7dd0f1ce261a11b16bd1725a12827161
    DHT: Remove per-process ChunkCache
    
    Performance testing has indicated the per-process ChunkCache isn't
    very effective for the DHT storage implementation.  If a server is
    using the DHT storage backend, it is most likely part of a larger
    cluster where requests are distributed in a round-robin fashion
    between the member servers.
    
    In such a scenario there is insufficient data locality between
    requests to get a good hit ratio on the per-process ChunkCache.  A low
    hit ratio means the cache is actually hurting performance by eating up
    memory that could otherwise be used for transient request data, and
    increasing pressure on the GC when it needs to find free space.
    
    Remove all of the ChunkCache code.  Installations that want to cache
    (to reduce database usage) should wrap their Database with a
    CacheDatabase and use a network based CacheServer.
    
    I left the ChunkCache in the original DHT storage commit because I
    wanted to document in the history of the project that its probably
    worth *not* having, but leave open a door for someone to revert this
    change if they find otherwise at a later date.
    
    Change-Id: I364d0725c46c5a19f7443642a40c89ba4d3fdd29
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit aa05559fd6a9099f90c8beeb80364e440e2614a2
    Merge "Let RefDirectory use FileSnapShot to handle fast updates"
    ----------------------------------------------------
    JGit commit 05fa1713da0ecc36829f321d798c2b08bf7936ff
    Add a DiffFormatter which calculates a patch-id
    
    Adds a class which can be used to calculates a SHA1 of the diff
    associated with a patch, similar to git patch-id.
    
    In this version whitespace is not ignored.
    
    Change-Id: I421d15ea905e23df543082786786841cbe3ef10d
    Signed-off-by: Stefan Lay <stefan.lay@sap.com>
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 7d380e9c5e1602e0938792869c4fcba88fd0dc2f
    Add CleanCommandTest and fix CleanCommand
    
    Bug: 334767
    Change-Id: I0a836451ceb668f943b1f353dc65420157810b23
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 08f0e1ffed11012e5069945eb730d44f0adbcd68
    Add CleanCommand to JGit API
    
    Bug: 334767
    Change-Id: I2650c77bc4af2d8f401bbcce5384b44ff2a64ba2
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 486e22c91f607bb15ddf3cd301f494912805127f
    Use the stored password instead of prompting for it all the time
    
    EGit change Iba3b87293c22e5fe7d989fc312184aa7463c4387 is also required
    to make this work for EGit.
    
    Change-Id: Iedc80e133e66d72e78ff0980b6e12634f75eca36
    Signed-off-by: Carsten Pfeiffer <carsten.pfeiffer@gebit.de>
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    ----------------------------------------------------
    JGit commit 2302a6d3ceea2926e785dba57abd58f609684e86
    Let RefDirectory use FileSnapShot to handle fast updates
    
    Since this change may affect performance and memory consumption on every
    access to a loose ref I explicitly made it a RFC to collect opinions.
    
    Previously RefDirectory.scanRef() was not detecting an update of a
    loose ref when the update didn't changed the modification time of
    the backing file. RefDirectory cached loose refs and the way to detect
    outdated cache entries was to compare lastmodification timestamp on the
    file representing the ref. If two updates to the same ref happen faster
    than the filesystem-timer granularity (for linux this is 2 seconds)
    there is the possiblity that we don't detect the update.
    
    Because of this bug EGit's PushOperationTest only works with 2 second
    sleeps inside.
    
    This change let RefDirectory use FileSnapshot to detect such situations.
    FileSnapshot helps to remember when a file was last read from disk and
    therefore enables to decide when to load a file from disk although
    modification time has not changed.
    
    Change-Id: I03b9a137af097ec69c4c5e2eaa512d2bdd7fe080
    Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 16e810b2ec37c2db8bc0e39426be385024a8de8a
    Add shortening of note ref names to NoteMap
    
    Change-Id: I224190bbb41c7cbea38388d0148ecc6dc68f3a14
    Signed-off-by: Kevin Sawicki <kevin@github.com>
    
    ----------------------------------------------------
    JGit commit c25c60061d43b521a428301960120794b9fba4f2
    Merge "Remove rebase temporary files on checkout failure"
    ----------------------------------------------------
    JGit commit 3344b93c84fa351623bf686d71dff9769e87144b
    Add GitAddTask
    
    Change-Id: Ia9a3c9f4728e13d1e62f530b1d843d09afb4eb42
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit cf846cfb0b2ceb65749561a0ea1cbbc0904a2ee9
    Remove rebase temporary files on checkout failure
    
    A checkout conflict during rebase setup should leave the repository
    in SAFE state which means ensuring that the rebase temporary files
    need to be removed.
    
    Bug: 346813
    Change-Id: If8b758fde73ed5a452a99a195a844825a03bae1a
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Commits on May 20, 2011
  1. Updated from JGit

    slluis committed May 20, 2011
    ----------------------------------------------------
    JGit commit 40fa75feb4536218a59b4cb6ea71e3579c8000dd
    Add LsRemoteCommandTest
    
    Bug: 343801
    Change-Id: I4a91d93428bbf7f74033fcea5823266fa52d7a0c
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit e170c314fb96977650d69f7af206d84a362126be
    Add LsRemoteCommand to JGit API
    
    Bug: 343801
    Change-Id: Ic651e8e09143e15ed459461b50b2222e13da56c4
    Also-by: Chris Aniszczyk <caniszczyk@gmail.com>
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 844bd74818fce68fadd8ef558fcbf661739c8878
    Add org.eclipse.jgit.ant.test to parent pom.xml
    
    Change-Id: I3fd0b509e03cbd5f2bf3bd6377287dab14e8728e
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit d60001c83bfd2dd5170dc1a9377d6eec422b8619
    Add GitCloneTaskTest
    
    Change-Id: Iec8cd032d8d659a896d909f9094f76b7d35147e6
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 5ec4977bb514ec8eb01dd22c3e908fe3fe6da83f
    Create a MergeResult for deleted/modified files
    
    Change Ia2ab4f8dc95020f2914ff01c2bf3b1bc62a9d45d added merge
    support for when OURS or THEIRS was simultaneously deleted
    and modified.  That changeset however did not add create an
    entry in the conflicts table so clients would see a CONFLICTING
    result but getConflicts() would return null.
    
    This change creates a MergeResult for the conflicting file.
    
    Bug: 345684
    Change-Id: I52acb81c1729b49c9fb3e7a477c6448d8e55c317
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 37fe0988b26b7893888a073a33ccf0865723ca8b
    Add reset with paths support to ResetCommand
    
    Bug: 338701
    Change-Id: Id7cbce47131b459e632ddc2c9a94628c7d0b75cd
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit f953a35e9a1f279ca038955243c07fd84fb6ae23
    Fix NPE in URIish when parsing an empty URI
    
    Change-Id: Id1c42dc9843f62c581b9904b02150de53cf7777c
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit dc30c95d971ca270f442403ada0d4e3b00151419
    Add org.eclipse.jgit.ant.test
    
    Change-Id: I9bfb1298864294b8ce29b91660f1cf8316e5f620
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit e3c4610c74c3eef0fdf573d45ab4fe0b01d61fe6
    Add tests for change If203ce5
    
    Bug: 344779
    Change-Id: I1628984479d93665bf4987d6a4ff8e67ad73eb36
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 557ea857e3b5229379476f1ee4160fcf5b695bbd
    Implement rebase ff for upstream branches with merge commits
    
    Change Ib9898fe0f982fa08e41f1dca9452c43de715fdb6 added support for
    the 'cherry-pick' fast forward case where the upstream commit history
    does not include any merge commits.  This change adds support for the
    case where merge commits exist and the local branch has no changes.
    
    Bug: 344779
    Change-Id: If203ce5aa1b4e5d4d7982deb621b710e71f4ee10
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 7449b9a297af193107560c42508c53d7adb00226
    Fix path filtering in LogCommand
    
    Bug: 346257
    Change-Id: Ib897e1b4962162da9670164479a844aeea7dfcd1
    Signed-off-by: Piotr Janik <janikpiotrek@gmail.com>
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit d781554b79b50e5c3fe468373e87edf8957d7578
    Merge "Optimize MergeAlgorithm if ours or theirs is empty"
    ----------------------------------------------------
    JGit commit 0461ff4f0c7ef505c818dac95286fa852f16eef7
    Optimize MergeAlgorithm if ours or theirs is empty
    
    Previously when merging two contents with a non-empty base and one of
    the contents was empty (size == 0) and the other was modified there
    was a potentially expensive calculation until we finally always come
    to the same result -> the complete non-deleted content should collide
    with the empty content.
    
    This proposal adds an optimization to detect empty input content and
    to produce the appropriate result immediatly.
    
    Change-Id: Ie6a837260c19d808f0e99173f570ff96dd22acd3
    Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Commits on May 17, 2011
  1. Updated from JGit

    slluis committed May 17, 2011
    ----------------------------------------------------
    JGit commit b13ca9121b8f2c6a0ebca1a2a12c4af7e75dfd20
    Merge "Fix diff bug on inserted line"
    ----------------------------------------------------
    JGit commit c2b87d59a0ca13f1444ea3a62decfa3f04ee7600
    Fix diff bug on inserted line
    
    For the following patch on the linux 2.6.32 tag:
    --- a/kernel/sched_fair.c
    +++ b/kernel/sched_fair.c
    @@ -685,6 +685,7 @@ static void enqueue_sleeper(struct cfs_rq *cfs_rq, struct sc
    
     static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se)
     {
    +#if 0
     #ifdef CONFIG_SCHED_DEBUG
            s64 d = se->vruntime - cfs_rq->min_vruntime;
    
    @@ -694,6 +695,7 @@ static void check_spread(struct cfs_rq *cfs_rq, struct
    sched
            if (d > 3*sysctl_sched_latency)
                    schedstat_inc(cfs_rq, nr_spread_over);
     #endif
    +#endif
     }
    
     static void
    
    JGit produced an incorrect diff, attempting to add a new "}" instead
    of the new "#endif" at the end of the hunk. This was caused by a prior
    fix for bug 328895 where we wanted to "slide" a diff down in the file
    when adding a new method/function and want to show the closing curly
    brace as being added after the new method, rather than added onto the
    end of the prior function or method just before the insertion point.
    
    Bug: 345956
    Change-Id: I32b9e24f1e2980258b1b39dd1807919ab1c5f9b2
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on May 16, 2011
  1. Updated from JGit

    slluis committed May 16, 2011
    ----------------------------------------------------
    JGit commit 2e43e1e904c9c8702d3c248d0fdb8b7cb6162cb2
    Add getConflicting() method in Status API
    
    Bug: 345899
    Change-Id: I133b9dd3e9a9c3c749547a884df3ce371929f38e
    Signed-off-by: Piotr Janik <janikpiotrek@gmail.com>
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
  2. Updated from JGit

    slluis committed May 16, 2011
    ----------------------------------------------------
    JGit commit 4b4df4ccf8e59273a7d78de2b378d530716b6f2d
    Merge "Fix diff when first text is the start of the other"
    ----------------------------------------------------
    JGit commit 51a5cc7f1a1033664ee2fb760ed217b665b12b34
    Fix diff when first text is the start of the other
    
    The problem occurred when the first text ends in the middle
    of the last line of the other text and the first text has no
    end of line.
    
    Bug: 344975
    Change-Id: I1f0dd9f8062f2148a7c1341c9122202e082ad19d
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    
    ----------------------------------------------------
    JGit commit 24ce43de0c266750a0856ca3549b895a8bb44f44
    Merge "Add test for reflog part of ResetCommand"
    ----------------------------------------------------
    JGit commit e9311e526c1ddff33cb7fc09578909ae9441ecd6
    Add test for reflog part of ResetCommand
    
    The reflog message fix was done in
    I4f1c3cd6b2cf543be213f061afb94223062dde51
    
    Change-Id: I44817ccf4bf226ed3e4ce6fb2d923e88788221dd
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    
    ----------------------------------------------------
    JGit commit c22eab4948fbeaa26f6b892b5061bb174496d1ca
    Add RebaseResult.FAST_FORWARD_RESULT
    
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit a31590ff63bbaad6b99036b32d6cdb4b647e5d6b
    RevertCommand: Add "." after reverted commit id
    
    This makes the message look the same as in C Git (the "."):
    
      This reverts commit <sha1>.
    
    Change-Id: I4c254c122277b127e7b039c0d1c7f7a0d691530d
    Signed-off-by: Robin Stocker <robin@nibor.org>
    
    ----------------------------------------------------
    JGit commit 4e7c2f807dea99dfa968d42f221921fc79e41526
    Update tycho version to 0.12
    
    Following migration instructions [1].
    
    [1] http://dev.eclipse.org/mhonarc/lists/tycho-user/msg00080.html
    
    Change-Id: I9e54f3e7e96892b64546270cbdf0308046e1d40c
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    
    ----------------------------------------------------
    JGit commit 0ea6d9c8d93c9210ab65452d0d4b5fd195f41b0b
    Update findbugs-maven-plugin to the official 2.3.2 release
    
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Commits on May 10, 2011
  1. Updated from JGit

    slluis committed May 10, 2011
    ----------------------------------------------------
    JGit commit 858408f8c34d3e1666da345c1464968c659a313d
    Merge "Formatter for relative dates"
    ----------------------------------------------------
    JGit commit c05c6f3327ca500d1d794c291f07d8ef4eb1aae4
    Formatter for relative dates
    
    Change-Id: I78b307177c68c578e10101a0ee7b6306880a08f7
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Commits on May 9, 2011
  1. Updated from JGit

    slluis committed May 9, 2011
    ----------------------------------------------------
    JGit commit 425d17b72dd2bfa002f6bf4041843fac1dbc57bf
    Remove unused serialVersionUID from non-serializable classes.
    
    Change-Id: I819e2ca88577382b54d38b7a1247e94a5127ef9e
    Signed-off-by: Kevin Sawicki <kevin@github.com>
    
    ----------------------------------------------------
    JGit commit 05bb92980b27cf8379e6a39f993ae21952ffe05d
    Fix getHumanishName broken for windows paths
    
    Since d1718a the method getHumanishName was broken on windows since
    the URIish is not normalized anymore. For a path like
    "C:\gitRepositories\egit" the whole path was returned instead of
    "egit".
    
    Bug: 343519
    Change-Id: I95056009072b99d32f288966302d0f8188b47836
    Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Commits on May 6, 2011
  1. Updated from JGit

    slluis committed May 6, 2011
    ----------------------------------------------------
    JGit commit b8fdda11cc4a786c24ba309ec755321dba6d9955
    Merge "IndexDiff: conflicting files aren't properly shown"
    ----------------------------------------------------
    JGit commit c36a892e7f2e01fc39047068ac01537fc952db8e
    Correct tabs in top-level pom.xml
    
    Change-Id: I55900b335f2056093e0a32086afb429a4bc183d3
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 298486a7c320629de12f9506e0133686a7382b01
    IndexDiff: conflicting files aren't properly shown
    
    Before this change any files in the conflicting set would
    also be listed in the the other IndexDiff Sets which is
    confusing.  With this change a conflicting file will not
    be included in any of the other sets.
    
    Change-Id: Ife9f2652685220bcfddc1f9820423acdcd5acfdc
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit e435f7de7748081945b02a0896dc54f4d6cc053c
    Update IP log to include Ant 1.8.2 (CQ 5111)
    
    Change-Id: I953720b88d34e74509b115dcd2c1eb48d3587484
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 5f22d67270466097713a0757e4f0f9f06cb06807
    Ignore submodule commits during checkout
    
    Submodules are supposed to be handled by separate operations, so
    we should ignore them on checkout, just like C Git does.
    
    This fix does not add submodule support. We just try harder
    to ignore them.
    
    Bug: 343566
    Change-Id: I2c5ae1024ea7bb57adf27072da6acc9643018eda
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    
    ----------------------------------------------------
    JGit commit 18b7e9400e5282bd3c47ec2d4772e4b1cae68683
    Merge "Fix "into" part of merge message for HEAD"
    ----------------------------------------------------
    JGit commit de8946c0c2c63907c0b14f2d9c419ac338b60588
    Store Git on any DHT
    
    jgit.storage.dht is a storage provider implementation for JGit that
    permits storing the Git repository in a distributed hashtable, NoSQL
    system, or other database.  The actual underlying storage system is
    undefined, and can be plugged in by implementing 7 small interfaces:
    
      *  Database
      *  RepositoryIndexTable
      *  RepositoryTable
      *  RefTable
      *  ChunkTable
      *  ObjectIndexTable
      *  WriteBuffer
    
    The storage provider interface tries to assume very little about the
    underlying storage system, and requires only three key features:
    
      *  key -> value lookup (a hashtable is suitable)
      *  atomic updates on single rows
      *  asynchronous operations (Java's ExecutorService is easy to use)
    
    Most NoSQL database products offer all 3 of these features in their
    clients, and so does any decent network based cache system like the
    open source memcache product.  Relying only on key equality for data
    retrevial makes it simple for the storage engine to distribute across
    multiple machines.  Traditional SQL systems could also be used with a
    JDBC based spi implementation.
    
    Before submitting this change I have implemented six storage systems
    for the spi layer:
    
      * Apache HBase[1]
      * Apache Cassandra[2]
      * Google Bigtable[3]
      * an in-memory implementation for unit testing
      * a JDBC implementation for SQL
      * a generic cache provider that can ride on top of memcache
    
    All six systems came in with an spi layer around 1000 lines of code to
    implement the above 7 interfaces.  This is a huge reduction in size
    compared to prior attempts to implement a new JGit storage layer.  As
    this package shows, a complete JGit storage implementation is more
    than 17,000 lines of fairly complex code.
    
    A simple cache is provided in storage.dht.spi.cache.  Implementers can
    use CacheDatabase to wrap any other type of Database and perform fast
    reads against a network based cache service, such as the open source
    memcached[4].  An implementation of CacheService must be provided to
    glue this spi onto the network cache.
    
    [1] https://github.com/spearce/jgit_hbase
    [2] https://github.com/spearce/jgit_cassandra
    [3] http://labs.google.com/papers/bigtable.html
    [4] http://memcached.org/
    
    Change-Id: I0aa4072781f5ccc019ca421c036adff2c40c4295
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 87455127a33fba9ebfdab9e2a611d4148c7501a4
    Add org.eclipse.jgit.ant to parent pom.xml
    
    Bug: 321237
    Change-Id: Idd106f2700740db07f41f6d31f50d6b2a30fa732
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    ----------------------------------------------------
    JGit commit 7546e3b4c5612e5f6ee564d0d01b17533e7e0b3b
    Fix "into" part of merge message for HEAD
    
    Merging into a non-master branch would result in the following message:
    
      Merge branch 'a' into HEAD
    
    Now the merge message is correct:
    
      Merge branch 'a' into b
    
    Change-Id: I488f97190e4c1711c23a7a3cbd64f8b13a87bbac
    Signed-off-by: Robin Stocker <robin@nibor.org>
    
    ----------------------------------------------------
    JGit commit eb9dba2fde1b0581ecae1e509a981a6158285f39
    Merge "Fix error handling in RepositoryFilter"
    ----------------------------------------------------
    JGit commit 2352290398183e940c2d3e478f49e3902367dd64
    Add pom.xml to org.eclipse.jgit.ant
    
    Also-by: Ketan Padegaonkar <KetanPadegaonkar@gmail.com>
    Bug: 321237
    CQ: 5111
    Change-Id: Ie93b85df76fcb5c077b93f01ed1959eaeffb3c20
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit de16d5e8f98610e253d46e25a39ee4edfca23b92
    Fix error handling in RepositoryFilter
    
    The filter did not correctly match smart HTTP client requests,
    so it always fell back on HTTP status codes for errors. This
    usually causes a smart client to retry a dumb request, which
    is not what the server wants.
    
    Change-Id: I42592378dc42fbe308ef30a2923786c690f668a9
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit e2413ce2f65b965a706621b50865cfda8c395c4f
    Present reset in the reflog like C Git does nowadays
    
    Confirmed for v1.7.4.1
    
    Change-Id: I4f1c3cd6b2cf543be213f061afb94223062dde51
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    
    ----------------------------------------------------
    JGit commit 98b019f4bdc45bd122e4d81009c4e814350e051c
    Implemented merge for parallel delete/modification
    
    Duplicates cgit behaviour for merging the case where
    OURS is deleted and THEIRS is modified as well as
    OURS is modified and THEIRS id deleted.
    
    Change-Id: Ia2ab4f8dc95020f2914ff01c2bf3b1bc62a9d45d
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 04df086d3e2564b06d2a462449942fcf6e71421b
    Add better exception handling for the git-init ant task
    
    Change-Id: Ia935720fc9c09b427abb84be038c4dc74610850c
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 7a9ebbfa9f39e67f00ab599f3d65098c55987f03
    Merge "Attempt to make git prefix detection more reliable"
    ----------------------------------------------------
    JGit commit f2a146d03372989321f1fa57a6cf33d484097ea8
    Merge "Add path support to checkout command."
    ----------------------------------------------------
    JGit commit ec92f8f59e1365048866d875458ff999f9c41bae
    Add path support to checkout command.
    
    Change-Id: I89e8edfc6dd87d5bf8fd08704df2432720084330
    Signed-off-by: Kevin Sawicki <kevin@github.com>
    
    ----------------------------------------------------
    JGit commit f9d7b0d21eb60a409efa6f99ac219d366fe5fa5b
    Qualify post-0.12 builds
    
    Change-Id: I70fe2671321efb5c3d271121ce00299533d1b388
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    
    ----------------------------------------------------
    JGit commit d085a8954f1f5999d2adf42ce6e89fd01714863b
    Merge branch 'stable-0.12'
    
    * stable-0.12:
      JGit 0.12.1
    
    ----------------------------------------------------
    JGit commit ea5df164045c2942a4956b374b1afa4155664f98
    Attempt to make git prefix detection more reliable
    
    This fix makes sure the readPipe methods drains the stderr
    pipe and close the subprocess' stdin stream before reading
    the process outputs.
    
    I never managed to repeat the reported problem myself, so this
    may help in diagnosing the probelm on other peoples machines.
    
    Bug: 337533
    Change-Id: I299555f09768c34d5868327e574326946ee265e1
    
    ----------------------------------------------------
    JGit commit dce5f96c1ee38c7e50584eac61adb6abdd38aca4
    Add better javadoc to the git-init ant task
    
    Change-Id: If41e5a9ab37533cce10ea1c1925d7bd3ece586ea
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit b2b58feba7400269df8b31ef8495b695af3a9793
    JGit 0.12.1
    
    Change-Id: Ia6e58b466fa3ef7ddd61b40f2ad44141fe8786c4
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    
    ----------------------------------------------------
    JGit commit 130ecaad6d10bcb11c7e60e043cf66a9d455e51a
    Add GitCheckoutTask to org.eclipse.jgit.ant
    
    Bug: 321237
    Change-Id: I5c4753f7b99d0be002b32e403f5dfff9353c57b0
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit f8b89a922f2fb554482213845be3e8a2c5cb6cfa
    Add GitCloneTask to org.eclipse.jgit.ant
    
    Bug: 321237
    Change-Id: I605da8150048158d918c577ef8ca4f6edbed0133
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit fdeb3272705865e886cc0d47de18c967281ec6bb
    Add org.eclipse.jgit.ant
    
    Adds the initial project and a GitInitTask.
    
    Bug: 321237
    Change-Id: I06b94e0b42b20ecf51f86845e47d49913f3513c4
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Commits on Apr 26, 2011
  1. Updated from JGit

    slluis committed Apr 26, 2011
    ----------------------------------------------------
    JGit commit d05d351f3be5207a168c43b7cc52404195c2d567
    Merge branch 'stable-0.12'
    
    * stable-0.12:
      Implement the no-done capability
    
    ----------------------------------------------------
    JGit commit b209671d04611ad9821cc538c46651452dea0ace
    Implement the no-done capability
    
    Smart HTTP clients may request both multi_ack_detailed and no-done in
    the same request to prevent the client from needing to send a "done"
    line to the server in response to a server's "ACK %s ready".
    
    For smart HTTP, this can save 1 full HTTP RPC in the fetch exchange,
    improving overall latency when incrementally updating a client that
    has not diverged very far from the remote repository.
    
    Unfortuantely this capability cannot be enabled for the traditional
    bi-directional connections.  multi_ack_detailed has the client sending
    more "have" lines at the same time that the server is creating the
    "ACK %s ready" and writing out the PACK stream, resulting in some race
    conditions and/or deadlock, depending on how the pipe buffers are
    implemented.  For very small updates, a server might actually be able
    to send "ACK %s ready", then the PACK, and disconnect before the
    client even finishes sending its first batch of "have" lines.  This
    may cause the client to fail with a broken pipe exception.  To avoid
    all of these potential problems, "no-done" is restricted only to the
    smart HTTP variant of the protocol.
    
    Change-Id: Ie0d0a39320202bc096fec2e97cb58e9efd061b2d
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit b9691b94a3e35d8faf77b61e9ec34848e4aae310
    Merge branch 'stable-0.12'
    
    * stable-0.12:
      Fix sorting of names in RefDirectory
      Make running static checks configurable in maven build
      Add constants for gerrit change id configuration
    
    ----------------------------------------------------
    JGit commit 33e65ec6911795cf2816af1f64b5699dd898d59f
    Fix sorting of names in RefDirectory
    
    RefDirectory did not correctly follow the contract of RefList.  The
    contract says if you use add() method of RefList builder, you MUST
    sort() it afterwards, and later every other method assumes that list
    is properly sorted (especially the binary search in the find() and
    get() methods).  Instead RefDirectory class tried to scan the refs
    recursively while sorting every folder in the process before
    processing and did not call sort().
    
    For example, when scanning the contents of refs/tags project1 string
    is smaller than project1-*, so it will recursively go into the folder
    and add these tags first and only then will add project-* ones. This
    will result in a broken list (any project1-* string is less than
    project1/* one, but they all appear after them in the list), that's
    why binary search will fail making loose RefList and the whole local
    RefMap completely unusable.
    
    Change-Id: Ibad90017e3b2435b1396b69a22520db4b1b022bb
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 0359184f4ed54eb5b880f66d9d514afa10d9fc4a
    Enabled unit tests in HttpClientTests
    
    Change-Id: I92ae117f1dcfc569e27c66c191e090a60fbe2bb6
    Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
    
    ----------------------------------------------------
    JGit commit 1a867d10b974cab4d43d77f5b392f4f07807ebd8
    Added support to IndexDiff to return information on conflicts
    
    Change-Id: I43c13eb72a44f80135c93525fce0c0280b0e64a2
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 502508f0286e07100e214fed5506ee20be5673dc
    Merge "Make running static checks configurable in maven build" into stable-0.12
    ----------------------------------------------------
    JGit commit df85978aae6520e29865016ccc906bdb68308660
    Make running static checks configurable in maven build
    
    In order to run the static checks run:
    
    mvn -P static-checks clean install
    
    Change-Id: I14077498a04be986ded123ddbfc97da8f9bc3130
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    
    ----------------------------------------------------
    JGit commit ce2de7db4c5f9e5a507f26455b144a6f58978d7e
    Add constants for gerrit change id configuration
    
    Change-Id: I22fc46dff6cc5dfd975f6e82161d265781778cde
    Signed-off-by: Stefan Lay <stefan.lay@sap.com>
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Commits on Apr 14, 2011
  1. Updated from JGit

    slluis committed Apr 14, 2011
    ----------------------------------------------------
    JGit commit b69284f72d717f50981c822edbff1dc3313cdd58
    Update eclipse IP log for 0.12
    
    Change-Id: I8f2ce63e039d5baabc1533477128470696a36ced
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    
    ----------------------------------------------------
    JGit commit 09be3948cd85171fa3a13d937c7125876e27a273
    Hande latin-1 encoding
    
    Bug: 342259
    Change-Id: Ie285b8819b5ea6f9892ebafc4ebbd9c6d091d1fe
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit e109529d6f7f9c69e6fe7e864b90cdcafe998cf0
    Add NotesCommand to the JGit API
    
    Bug: 334765
    Change-Id: Ie0fb79671e7a741eb85651f507b8ade930bfcc20
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Commits on Apr 11, 2011
  1. Updated from JGit

    slluis committed Apr 11, 2011
    ----------------------------------------------------
    JGit commit 72c2203117feb161d66a5403790ba27e5029804f
    Merge "Create all test data in trash folder"
    ----------------------------------------------------
    JGit commit ea0f2f9e39a743a90a9dcdf3341ff907a0ec83d3
    Create all test data in trash folder
    
    This ensures that all test data is separated from project sources and
    cleaned up after the test. Previously the cloned bare test repository
    was created in org.eclipse.jgit.test/ and not deleted after the test
    run.
    
    Change-Id: I55110442e365fc8fe610f1c372f72a71ee6e1412
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    ----------------------------------------------------
    JGit commit b8669ed5c06633a46f434894206594edd0dfbe19
    Update to use Tycho 0.11
    
    Change-Id: I1f9053fe2af39898851b41e1e86c9320ab5594ca
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Commits on Apr 8, 2011
  1. Updated from JGit

    slluis committed Apr 8, 2011
    ----------------------------------------------------
    JGit commit 5dbef3fa51053b37f68b44ed390cab6dc8336dcc
    Add "Conflicts" section to merge message on conflict
    
    The same as with cherry-pick, the commit message of a merge should
    include a "Conflicts" section when the merge resulted in conflicts.
    
    Change-Id: I6261dc898262322924af5ca1bef841a654b0df55
    Signed-off-by: Robin Stocker <robin@nibor.org>
    
    ----------------------------------------------------
    JGit commit 3151657404859454bdf60345c09b536d1269c0c8
    Refactor reading and writing heads in Repository
    
    Add private methods which are used for reading and writing MERGE_HEAD
    and CHERRY_PICK_HEAD files, as suggested in the comments on change
    I947967fdc2f1d55016c95106b104c2afcc9797a1.
    
    Change-Id: If4617a05ee57054b8b1fcba36a06a641340ecc0e
    Signed-off-by: Robin Stocker <robin@nibor.org>
    
    ----------------------------------------------------
    JGit commit 6e10aa42e90a25b82f00f0c27574f57ffa9e4a25
    Add CHERRY_PICK_HEAD for cherry-pick conflicts
    
    Add handling of CHERRY_PICK_HEAD file in .git (similar to MERGE_HEAD),
    which is written in case of a conflicting cherry-pick merge.
    
    It is used so that Repository.getRepositoryState can return the new
    states CHERRY_PICKING and CHERRY_PICKING_RESOLVED. These states, as well
    as CHERRY_PICK_HEAD can be used in EGit to properly show the merge tool.
    
    Also, in case of a conflict, MERGE_MSG is written with the original
    commit message and a "Conflicts" section appended. This way, the
    cherry-picked message is not lost and can later be re-used in the commit
    dialog.
    
    Bug: 339092
    Change-Id: I947967fdc2f1d55016c95106b104c2afcc9797a1
    Signed-off-by: Robin Stocker <robin@nibor.org>
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit fbf35fea4ec254339f9b0eee7865eb6ccfe22700
    Add parameters for timeout and branches to clone
    
    The timeout is also used in the FetchCommand called by the
    CloneCommand.
    
    The possibility to provide a list of branches to fetch initially is a
    feature offered by EGit. To implement it here is a prerequisite for
    EGit to be able to use the CloneCommand.
    
    Change-Id: I21453de22e9ca61919a7c3386fcc526024742f5f
    Signed-off-by: Stefan Lay <stefan.lay@sap.com>
    ----------------------------------------------------
    JGit commit 792b93bc62bb3714eb04ccf6e0c800d3b5b85f5b
    Try to checkout branch after cloning
    
    When no branch was specified in the clone command, HEAD pointed to a
    commit after clone. Now the clone command tries to find a branch which
    points to the same commit and checks out this branch.
    
    Bug: 339354
    Change-Id: Ie3844465329f213dee4a8868dbf434ac3ce23a08
    Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Commits on Apr 5, 2011
  1. Updated from JGit

    slluis committed Apr 5, 2011
    ----------------------------------------------------
    JGit commit e24005de2d28bf6c246e2ce4e5413ae136920877
    Fix DirCache.isModified()
    
    Change I61a1b45db2d60fdcc0f87373ac6fd75ac4c4a202 fixed a possible NPE
    occurring for newly created repositories - but in that case a wrong
    value (false = not modified) was returned.
    
    If a current version of the index file exists (liveFile), but there is
    no snapshot, this means that there have been modifications (i.e. true
    has to be returned).
    
    Change-Id: I698f78112249f9924860fc58eb7eab7afdf87eb7
    Signed-off-by: Philipp Thun <philipp.thun@sap.com>
    
    ----------------------------------------------------
    JGit commit efad7327ca277f493a2c577866fed75702cd08ed
    [findbugs] Use explicit initialization
    
    Findbugs doesn't like using implicitly initialized field in
    initializer.
    
    Change-Id: Ic1ff9011813cc02950a71df587f31ed9f8415b49
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    
    ----------------------------------------------------
    JGit commit 7aec8247c1ecd8e75f1e41a3d06bd69022d38486
    [findbugs] Make mutable static field final
    
    Change-Id: I310bc2093571bf22a58106f09706cc3eb43a2453
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
  2. Fix bug in PipedInputStream

    slluis committed Apr 5, 2011
    There was a deadlock when trying to write a byte array bigger than the
    internal buffer. Added a unit test for that.
Commits on Apr 3, 2011
  1. Updated patch.

    slluis committed Apr 3, 2011
  2. Updated from JGit

    slluis committed Apr 3, 2011
    ----------------------------------------------------
    JGit commit 7b3a6ef5306154240030a6de528bde0c482db0dd
    Merge "Make DeltaBaseCache per-ObjectReader"
    ----------------------------------------------------
    JGit commit 2b4286991270dff67f0e9cc5f77b074748b48539
    Merge "Fix ReceivePack connectivity validation with alternates"
    ----------------------------------------------------
    JGit commit 12d7e3af1a1246d1ff65dffc79d20a1d9845b28d
    Merge "Add open(File) and wrap(Repository) to Git"
    ----------------------------------------------------
    JGit commit 82372d36f85b5ef003ae1af6857e7a3129049ac5
    Add open(File) and wrap(Repository) to Git
    
    When a new Git instance for an exisiting git repository should be
    created there are two use-cases: either the application has already a
    Repository instance in hand or the application knows where the
    repository resides in the filesystem. Two methods are added to
    explicitly support these use-cases: wrap(Repository db) and open(File
    gitDir)
    
    Change-Id: I2970e4aa8d4602cb1298f01e5b76bf0f96c492e5
    Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
    
    ----------------------------------------------------
    JGit commit 11e2e746c13cc94cabc96e708f3c6a2b159b5995
    Support reading first SHA-1 from large FETCH_HEAD files
    
    When reading refs, avoid reading huge files that were put there
    accidentally, but still read the top of e.g. FETCH_HEAD, which
    may be longer than our limit. We're only interested in the first line
    anyway.
    
    Bug: 340880
    Change-Id: I11029b9b443f22019bf80bd3dd942b48b531bc11
    Signed-off-by: Carsten Pfieffer <carsten.pfeiffer@gebit.de>
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit 1e03d52f33bbe8398ca0f19612d8f908d4f2a3ec
    Merge "Let LockFile.unlock use FileUtils.delete()"
    ----------------------------------------------------
    JGit commit 53fb027284af07c0344d3da6187a08afbfed59f0
    Make DeltaBaseCache per-ObjectReader
    
    The 'Counting objects' phase of PackWriter requires good hit rates
    from the DeltaBaseCache while walking trees, the deltas need to find
    their bases in the cache in order to inflate in a reasonable time.
    
    If JGit is running in a multi-threaded server, such as Gerrit Code
    Review, each thread needs its own DeltaBaseCache to prevent one thread
    from evicting the other thread's relevant bases.  Move the cache to be
    per-ObjectReader, lazily allocated when required by a PackFile.
    
    Change-Id: If9d5ed06728e813632ae96dcfb811f4860b276e8
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 3609dde4cde62b9d74a6867cba6ed6b0a07320a0
    Fix ReceivePack connectivity validation with alternates
    
    If a repository has an alternate object database, the alternate has
    its references advertised as ".have" lines, which permits the client
    to use these as delta base candidates when generating the pack.  If
    setCheckReferencedObjectsAreReachable(true) is used, these additional
    have lines need to be considered in addition to the advertised refs.
    
    Change-Id: Ie39c6696f9d3ff147ef4405cd5624f6011700ce5
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit d8bcc84154f2f34ddb8662e7b32daa83fcde45a9
    Let LockFile.unlock use FileUtils.delete()
    
    We sometimes face the problem that the file .git/index.lock
    can't deleted causing JGit operations to fail. Problem is
    that LockFile.unlock() simply deletes the lockfile and ignores the
    return value of File.delete(). Instead use
    FileUtils.delete() with retry option. This method will retry the
    deletion of the file at most 10 times with sleeps inbetween.
    
    Bug: 335959
    Change-Id: I9598edea9f2304fe12e6f470301211b503434848
    Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
    
    ----------------------------------------------------
    JGit commit ffbaf694e28fcc62c50326cd555d8f2646d31a0d
    Enhance RefDatabase with a refresh() method
    
    There should be a way to explictly refresh the refs cached in the
    RefDirectory. Since commit c261b28 (use of FileSnapshot) this is
    not needed anymore for storage in the filesystem. But for DHT based
    storage an explicit refresh may be needed.
    
    Change-Id: I7d30c3496c05e1fb6e9519f3af9f23c6adb93bf9
    Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
    
    ----------------------------------------------------
    JGit commit c261b28f677fdc755b86d16abebd2c30093514b4
    RefDirectory: Use FileSnapshot for packed-refs
    
    Instead of tracking the length and modification time by hand, rely
    on FileSnapshot to tell RefDirectory when the $GIT_DIR/packed-refs
    file has been changed or should be re-read from disk.
    
    Change-Id: I067d268dfdca1d39c72dfa536b34e6a239117cc3
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 58ed0cb840b29139483ce3b499354a6e5669498b
    smart HTTP: Return errors inside payload
    
    When the client is clearly making a smart HTTP request to our smart
    HTTP server, return any errors like RepositoryNotFoundException or
    ServiceNotEnabledException inside of the payload as a Git level ERR
    message, rather than an HTTP error code.
    
    This prevents the C Git command line client from retrying a failed
    "$URL/info/refs?service=git-upload-pack" request without the smart
    service URL, only to fail again with "403 Forbidden" when the dumb
    as-is service has been disabled by the server configuration, or is
    unavailable because the repository is not on the local filesystem.
    
    Change-Id: I57e8756d5026e885e0ca615979bfcd729703be6c
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 64b524e3ca3d1f66edaa49eda2d8863ddca779b5
    UploadPack: Add a PreUploadHook to monitor and control behavior
    
    Embedding applications can use this hook to watch actions within
    UploadPack and possibly reject them. This could be useful to prevent
    clones of a large repository from this server, or to stop abusive
    negotiation rounds that offer thousands of objects in a single batch.
    
    Change-Id: Id96f1885ac4d61f22c80b6418fff54184b7348ba
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit af3562f7f70a9017f6f90d266f2b2a6fc3b361ad
    Allow application filters on smart HTTP operations
    
    Permit applications embedding GitServlet to wrap the
    info/refs?service=$name and /$name operations with a
    servlet Filter.
    
    To help applications inspect state of the operation,
    expose the UploadPack or ReceivePack object into a
    request attribute.  This can be useful for logging,
    or to implement throttling of requests like Gerrit
    Code Review uses to prevent server overload.
    
    Change-Id: Ib8773c14e2b7a650769bd578aad745e6651210cb
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 8ac65d33ed7a94f77cb066271669feebf9b882fc
    PackWriter: Fix the way delta chain cycles are prevented
    
    Take a very simple approach to avoiding delta chains during object
    reuse: objects are now always selected from the oldest pack that
    contains them.  This prevents cycles because a pack must not have
    a cycle in the delta chain.  If both objects A and B are chosen
    out of the same source pack then there cannot be an A->B->A cycle.
    
    The oldest pack is also the most likely to have the smallest deltas.
    Its the biggest pack in the system and probably came from the clone
    (or last GC) of this repository, where all objects were previously
    considered and packed tightly together.  If an object appears again
    (for example due to a revert and a push into this repository) the
    newer copy of won't be nearly as small as the older delta version
    of it, even if the newer one is also itself a delta.
    
    ObjectDirectory already enumerates objects during selection in this
    newest->oldest order, so it already is supplying these assumptions
    to PackWriter.  Taking advantage of this can speed up selection by
    a tiny amount by avoiding some tests, but can also help to prevent
    a cycle needing to be broken on the fly during writing.
    
    The previous cycle breaking logic wasn't fully correct either.
    If a different delta base was chosen, the new delta base might not
    have been written into the output pack before the current object,
    forcing the use of REF_DELTA when OFS_DELTA is always smaller.
    This logic has now been reworked to always re-check the delta base
    and ensure it gets written before the current object.
    
    If a cycle occurs, it gets broken the same way as before, by
    disabling delta reuse and finding an alternative form of the
    object, which may require inflating/deflating in whole format.
    
    Change-Id: I9953ab8be54ceb8b588e1280d6f7edd688887747
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 36a38adf719330a14ddd3f0bf8859cde0166d2ce
    PackWriter: Combine small reuse batches together
    
    If the total number of objects to look for reuse on is under 4096
    this is really close to a reasonable batch size for the DHT storage
    system to lookup at once.  Combine all of the objects into a single
    temporary list, perform reuse, and then prune the main lists if any
    duplicate objects were detected from a selected CachedPack.
    
    The intention here is to try and avoid 4 tiny sequential lookups
    on the storage system when the time to wait for each of those to
    finish is higher than the CPU time required to build (and later
    GC) this temporary list.
    
    Change-Id: I528daf9d2f7744dc4a6281750c2d61d8f9da9f3a
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 0be24ebf33974d4f1512644608769cb82d1782ea
    PackWriter: Remove dummy list 0
    
    Instead of looping over the objectsLists array, always set slot 0 to
    null and explicitly work on the 4 indexes that matter.  This kills
    some loops and increases the length of the code slightly, but I've
    always really disliked that dummy 0 slot.
    
    Change-Id: I5ad938501c1c61f637ffdaff0d0d88e3962d8942
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 9f5bbb5dd41f87d6428eb49c021e00d8099d0c17
    PackWriter: Speed up pruning of objects from cached packs
    
    During object enumeration for the thin pack, very few objects come
    out that are duplicated with the cached pack. Typically these are
    only cases where a blob or tree was cherry-picked forward, got a
    copy or rename, or was reverted... all relatively infrequent events.
    
    Speed up pruning of the thin pack object list by combining the phase
    with the object representation selection. Implementers should already
    be offering to reuse the object from the cached pack if it is stored
    there, at which point the implementation can perform a very fast type
    of containment test using the cached pack's identity rather than yet
    another index lookup.  For the local disk case this is probably not a
    big improvement, but it does help on the DHT implementation where the
    two passes combined into one reduces latency.
    
    Change-Id: I6a07fc75d9075bf6233e967360b6546f9e9a2b33
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 00eae14a7f736640da0086a9a9eb73ed50963eb8
    Make PacketLineIn public
    
    PacketLineOut is already public. Make PacketLineIn partially public
    in case an application needs to use some of the pkt-line protocol.
    
    Change-Id: I5b383eca980bd9e16a7dbdb5aed040c6586d4f46
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit a4c142286e99529cd3707473db0ccea362d84545
    Merge changes I2c8e917a,Ica9e50c0
    
    * changes:
      Do not normalize URIishes
      Use Ignore to bypass unused test
    
    ----------------------------------------------------
    JGit commit bc42a780eb1a1b28eeb3034ff05d21a166644751
    Merge "Fix broken git prefix detection"
    ----------------------------------------------------
    JGit commit 74419e1474b286e92dd812005fc585c3e1f21c59
    Bump jsch to 0.1.44
    
    It fixes 'Corrupted MAC on input' ssh issue.
    
    CQ: 4728
    Change-Id: I7de63cb3482488ac938566706edebee8a1cdad3a
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit d1718a34d3f2c258a166b563c477b268ac8002ed
    Do not normalize URIishes
    
    We used to normalize URI's since it seems simple. This however causes
    inconsistencies to the user and to out tests. Just pass backslashes
    through and make sure our parser can handle them.
    
    Bug: 341062
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    Change-Id: I2c8e917a086faabcd8749160c2acc9dd05a42838
    
    ----------------------------------------------------
    JGit commit 73602c448cde4e69ca59476d2b1c49ef91367591
    Use Ignore to bypass unused test
    
    Change-Id: Ica9e50c0d512865d217f55bf0d100f27878031b9
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    
    ----------------------------------------------------
    JGit commit 76d25273cc6faf134898771db60fae4b9e27f5d9
    Fix broken git prefix detection
    
    If JGit got a cygwin path it would fail to resolve directories
    relative to it.
    
    Also add system property to debug problems with the FS utilities.
    Enable debug using -Djgit.fs.debug=1
    
    Furthermore use -Djgit.gitprefix=<path> to set the git prefix
    manually.
    
    Change-Id: I5a58ee45c2d2ae5322f87fd6972526169b2918c8
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Commits on Mar 31, 2011
  1. Updated from JGit

    slluis committed Mar 31, 2011
    ----------------------------------------------------
    JGit commit 6935db4ec2995e818e7202f26c6eb1f99a48dc54
    Let CloneCommand not checkout HEAD on bare repos
    
    If the clone command clones into a bare repository it should not try
    to checkout HEAD in the end. For bare repos checkout is not possible.
    
    Change-Id: I359719d421b93c9d2e962e3c0eccc2b59235c3d1
    Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
    ----------------------------------------------------
    JGit commit 153283f05adc7cd3da44d49d576ec2562ac76608
    Added Merge command to the CLI
    
    This merge command accepts the merge strategy as option and uses the
    resolve strategy as default. It expects exactly one other
    revision which is merged with current head.
    
    Change-Id: Ia8c188b93ade4afabe6a9ccf267faf045f359a3a
    Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit eac2dc18f11e517d995cf2db68d5675390daa02b
    Allow InitCommand to run on existing git repos
    
    To be more consistent with what native git does we should allow
    to run the InitCommand also on existing git repos.
    
    Change-Id: I833637842631b37dce96ed9729b3a6ed24054056
    Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Commits on Mar 30, 2011
  1. Fix sorting of string arrays

    slluis committed Mar 30, 2011
    In Java, string comparisons compare char ordinals. This fixes
    MonoDevelop bug #683681.
Commits on Mar 29, 2011
  1. Updated from JGit

    slluis committed Mar 29, 2011
    ----------------------------------------------------
    JGit commit c8b698abb986b1c07d01a48d859c541aa8d1e9bb
    Merge "Do not categorize merge failures as 'abnormal'"
    ----------------------------------------------------
    JGit commit 761b9285f07bf209ea3b282fe9079cbbf097fd79
    Do not categorize merge failures as 'abnormal'
    
    This change contains a simple renaming. Instead of using the
    expression 'abnormal failure', we just treat this kind of situation
    as 'failure'. This is specific enough as conflicts are already handled
    separately.
    
    Change-Id: I535acdc7d022543ed0f5ac6151b09a6985f4ef38
    Signed-off-by: Philipp Thun <philipp.thun@sap.com>
Commits on Mar 28, 2011
  1. Updated from JGit

    slluis committed Mar 28, 2011
    ----------------------------------------------------
    JGit commit 475672866a15ff325583e9ccadd9d606d8b66384
    Fix possible NPE in DirCache.isModified()
    
    The snapshot field of a DirCache object for a newly created repository
    can be null. This fix prevents a NPE when isModified() is called in
    such a situation.
    
    Change-Id: I61a1b45db2d60fdcc0f87373ac6fd75ac4c4a202
    Signed-off-by: Philipp Thun <philipp.thun@sap.com>
  2. Improve exception message

    slluis committed Mar 28, 2011
  3. Updated from JGit

    slluis committed Mar 28, 2011
    ----------------------------------------------------
    JGit commit 23967441fc5b72996f5f29e197d52e763a14cb32
    Merge "Detaching HEAD when checking out the same commit."
    ----------------------------------------------------
    JGit commit 6e10c1da0018d2be47e4a0ac06a18205e82da673
    Merge "Fix: possible IndexOutOfBoundsException in ReflogReader"
    ----------------------------------------------------
    JGit commit fc5d521e4b3d378727f4649554cd62c56d8e0c02
    Merge "Registering the Checkout command and fixed a typo."
    ----------------------------------------------------
    JGit commit 3a86868c0883d2a564db88bf9ae4a5fe235bb63f
    Detaching HEAD when checking out the same commit.
    
    Detaching HEAD didn't work in some corner checkout cases.  If, for example,
    HEAD is symbolic ref to refs/heads/master, refs/heads/master is ref to commit
    c0ffee... then:
    
        checkout c0ffee...
    
    would leave the HEAD unchanged.
    
    The same symptom occurs when checking out a remote tracking branch or a tag
    that references the same commit as refs/heads/master.
    
    In the above case, the RefUpdate class didn't have enough information to decide
    if the update needed to detach symbolic ref because it dealt only with new/old
    objectIDs. Therefore, this fix introduced the RefUpdate.detachingSymbolicRef
    flag.
    
    Bug: 315166
    Change-Id: I085c98b77ea8f9104a213978ea0d4ac6fd58f49b
    Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
    
    ----------------------------------------------------
    JGit commit 13fffa75139fa49cd037868c2fd41bd0c8158f75
    Registering the Checkout command and fixed a typo.
    
    The Checkout command line command was added to JGit but it wasn't
    registered in the list of available commands.
    Additionally, the 'force' option was named '---force' (triple '-').
    
    Change-Id: I259773932fa9aec3bb29e215740e67c834566f6f
    Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
    
    ----------------------------------------------------
    JGit commit a327770433ef4495834c382f62aaeea75c847bbf
    Fix: possible IndexOutOfBoundsException in ReflogReader
    
    java.lang.IndexOutOfBoundsException
    at java.nio.ByteBuffer.wrap(ByteBuffer.java:352)
    at org.eclipse.jgit.util.RawParseUtils.decodeNoFallback(RawParseUtils.java:913)
    at org.eclipse.jgit.util.RawParseUtils.decode(RawParseUtils.java:880)
    at org.eclipse.jgit.util.RawParseUtils.decode(RawParseUtils.java:839)
    at org.eclipse.jgit.storage.file.ReflogReader$Entry.<init>(ReflogReader.java:102)
    at org.eclipse.jgit.storage.file.ReflogReader.getReverseEntries(ReflogReader.java:183)
    at org.eclipse.jgit.storage.file.ReflogReader.getReverseEntries(ReflogReader.java:162)
    
    Change-Id: I22a18bc7193962e5018c40a75337f9976b585c40
Commits on Mar 25, 2011
  1. Updated from JGit

    slluis committed Mar 25, 2011
    ----------------------------------------------------
    JGit commit 5152ed8e2e64ff5dc8a7def67080f0b81f25b8a5
    Prevent NPE during fetch and push via SSH
    
    Bug: 340928
    Change-Id: I870b77eeffa70a57891d7253a06ad7d44d808ee4
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Commits on Mar 24, 2011
  1. Updated from JGit

    slluis committed Mar 24, 2011
    ----------------------------------------------------
    JGit commit 0b5ad24915824a8c999bb6951b131a958e418306
    Introduce FAILED result for RebaseCommand
    
    In case an underlying cherry-pick fails due to uncommitted changes, a
    RebaseCommand shall fail and roll-back changes.
    
    Change-Id: Ic22eb047fb03ac2c8391f777036b7dbf22a1b061
    Signed-off-by: Philipp Thun <philipp.thun@sap.com>
  2. Fix unit tests.

    slluis committed Mar 24, 2011
  3. Updated from JGit

    slluis committed Mar 24, 2011
    ----------------------------------------------------
    JGit commit 55b7bd247ef86c6650c9acc364f426cec38723b5
    Merge "Introduce CherryPickResult"
    ----------------------------------------------------
    JGit commit c160293d71a3d2cf1f4a89868e2bf6c420f50cf0
    Add status command to GIT api
    
    Allow users of the GIT api to get to know the state of their
    workingtree and index by adding a status command. The implementation
    is mainly a wrapper around IndexDiff class. Better support for multiple
    stages in the index (conflict situations) is still missing. An
    appropriate change to IndexDiff and StatusCommand will come in a
    subsequent commit.
    
    Bug: 337296
    Change-Id: Idb390375a68611853c1c903299ec678c89b081dc
    Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit ccd3d83719eb89045f8b371b041c8e6456d3b403
    Create RemoteSession interface
    
    The RemoteSession interface operates like a simplified version of
    java.lang.Runtime with a single exec method (and a disconnect
    method). It returns a java.lang.Process, which should begin execution
    immediately. Note that this greatly simplifies the interface for
    running commands. There is no longer a connect method, and most
    implementations will contain the bulk of their code inside
    Process.exec, or a constructor called by Process.exec. (See the
    revised implementations of JschSession and ExtSession.)
    Implementations can now configure their connections properly without
    either ignoring the proper use of the interface or trying to adhere
    to an overly strict interface with odd rules about what methods are
    called first.  For example, Jsch needs to create the output stream
    before executing, which it now does in the process constructor. These
    changes should make it much easier to add alternate session
    implementations in the future.
    
    Also-by: John D Eblen <jdeblen@comcast.net>
    Bug: 336749
    CQ: 5004
    Change-Id: Iece43632086afadf175af6638255041ccaf2bfbb
    Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
    
    ----------------------------------------------------
    JGit commit a21e508a318664dac23701ca29d5f0b64d36a76a
    Introduce CherryPickResult
    
    In order to distinguish cherry-pick failures caused by conflicts vs.
    'abnormal failures' (e.g. due to unstaged changes or a dirty
    worktree), a CherryPickResult class is introduced and returned by
    CherryPickCommand.call() instead of a RevCommit. This new class is
    similar to MergeResult and RebaseResult. The CherryPickResult contains
    all necessary information, e.g. paths causing the cherry-pick (a merge
    called within, respectively) to fail. This allows callers to better
    react on failures.
    
    Change-Id: I5db57b9259e82ed118e4bf4ec94463efe68b8c1f
    Signed-off-by: Philipp Thun <philipp.thun@sap.com>
    Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Commits on Mar 23, 2011
  1. Updated from JGit

    slluis committed Mar 23, 2011
    ----------------------------------------------------
    JGit commit 770c733687d9f2f71f30822f9691427bf83b7577
    PullCommand: Use short ref name in merge message
    
    Add a test case for PullCommand for the successful merge case and test
    that the short ref name is used.
    
    Change-Id: I16cbbc88595f73e5512f984e67f93f87ee0fe242
    Signed-off-by: Robin Stocker <robin@nibor.org>
Commits on Mar 21, 2011
  1. Updated from JGit

    slluis committed Mar 21, 2011
    ----------------------------------------------------
    JGit commit dcf7bd9a8f7acafbd1461dc0414aded2db030983
    Improve MergeResult
    
    Add paths causing abnormal merge failures (e.g. due to unstaged
    changes) to the MergeResult returned by MergeCommand. This helps
    callers to better handle (e.g. present) merge results.
    
    Change-Id: Idb8cf04c5cecfb6a12cb880e16febfc3b9358564
    Signed-off-by: Philipp Thun <philipp.thun@sap.com>
    
    ----------------------------------------------------
    JGit commit dcefc660f15a85fcc2b4ca21ca5d12938b157e82
    Refactor test cases
    
    This change moves commonly used methods into the RepositoryTestCase
    base class.
    
    Change-Id: I56a46c31ee1661c7ce22eb755ab23da8bc9f5da2
    Signed-off-by: Philipp Thun <philipp.thun@sap.com>
Commits on Mar 19, 2011
  1. Updated from JGit

    slluis committed Mar 19, 2011
    ----------------------------------------------------
    JGit commit a62abbe180a6793adcc5a3db7a55c225066daf8d
    Merge "PackWriter: Collect stats by object type"
    ----------------------------------------------------
    JGit commit 9cde331c2b707a0a30296ac36ddc0875db254dd6
    Merge "BlockList: Micro-optimize appending from another BlockList"
    ----------------------------------------------------
    JGit commit bb1956e647d2f48ef36ef98a7f22120fdad0b37c
    PackWriter: Collect stats by object type
    
    Frequently enough I'm wondering how much of a pack is commits vs.
    trees, and the total line doesn't really tell us this because its
    a gross total from the pack. Computing the counts per object type
    is simple during packing, as PackWriter already has everything in
    memory broken up by object type.  Its virtually free to get these
    values and track them.
    
    Change-Id: Id5e6b1902ea909c72f103a0fbca5d8bc316f9ab3
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit 62fe7c7313e4e7a4339fe9df3a9dc2335461df29
    BlockList: Micro-optimize appending from another BlockList
    
    Simple variant of addAll() that knows how to copy large segments
    quickly using System.arraycopy() rather than looping through with
    an Iterator object.
    
    Change-Id: Icb50a8f87fe9180ea28b6920f473bb9e70c300f1
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  2. Updated from JGit

    slluis committed Mar 19, 2011
    ----------------------------------------------------
    JGit commit 817d1a334bf158ffcb2c4248813196dfdd578215
    Merge "PackFile: Cache the packName string"
    ----------------------------------------------------
    JGit commit 48fb404a3f155805a67bdc18c7ca22d18df03be2
    PackFile: Cache the packName string
    
    Instead of computing this on every request, compute it once and
    hold onto the result. This improves performance for LocalCachedPack
    which does a lot of tests against the pack name string.
    
    Change-Id: I3803745e3a5dda7b5f0faf39aae9423e2c777e7f
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    
    ----------------------------------------------------
    JGit commit bf05108d0b1aa7253659237d6848abc72c5e185e
    Abort merge when file to be checked out is dirty
    
    In case a file needs to be checked out (from THEIRS) during a merge
    operation, it has to be checked if the worktree version of this file
    is dirty. If this is true, merge shall fail.
    
    Change-Id: I17c24845584700aad953c3d4f2bea77a0d665ec4
    Signed-off-by: Philipp Thun <philipp.thun@sap.com>
    
    ----------------------------------------------------
    JGit commit 28ffed23072e0b1e8697adc53448c2c71f0d1306
    Merge "Refactor ResolveMerger"
    ----------------------------------------------------
    JGit commit fdb0a34abfd8b105a08887821d857fcdda2e22c4
    Refactor ResolveMerger
    
    1. Perform an explicit check for untracked files.
    2. Extract 'dirty checks' into separate methods
    3. Clean up comments.
    4. Tests: also check contents of files not affected by merge.
    
    Change-Id: Ieb089668834d0a395c9ab192c555538917dfdc47
    Signed-off-by: Philipp Thun <philipp.thun@sap.com>
Commits on Mar 18, 2011
  1. Udate c# patch.

    slluis committed Mar 18, 2011