aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Command line: implement checkout -- <path>Matthias Sohn2014-05-123-4/+45
| | | | Change-Id: I3d261e6541fe0fcaa210587d2aa226e153071351 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc errors caused by missing tags for declared exceptionsTomasz Zarna2014-05-121-0/+3
| | | | | Change-Id: I587aae0ad217ed092f061682ffa66c724f221096 Signed-off-by: Tomasz Zarna <tomasz.zarna@tasktop.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Handle repo copyfile in bare repositories.Yuxuan 'fishy' Wang2014-05-095-35/+145
| | | | | Change-Id: Ie06f0c3d1bc9b2123102efaa5542ec3c232b72cd Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* Handle the revision attribute in repo manifest.Yuxuan 'fishy' Wang2014-05-093-32/+219
| | | | | Change-Id: I77fe073aeb13c58029551b7d6e1451a9b62dc766 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* Handle repo submodules for bare repositories.Yuxuan 'fishy' Wang2014-05-074-15/+245
| | | | | Change-Id: Id028a7bc9600baf0f3e2316a1f4b99e53ccc746a Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* Fix manifests of source bundlesMatthias Sohn2014-05-074-8/+8
| | | | | | | | | | | | - don't mark them as singleton to allow coexistence of multiple versions in the same installation - add missing version qualifier to Eclipse-SourceBundle header see https://dev.eclipse.org/mhonarc/lists/cross-project-issues-dev/msg10524.html Change-Id: Ie4e028038f5a1d3e18b0be06c3d2ea82e7f9068d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge changes I9ba0e70f,I1f38e055,Idb55a303Dave Borowitz2014-05-064-8/+137
|\ | | | | | | | | | | | | * changes: Do not rewrite parents in RevWalkTextBuiltins RevWalk: Allow disabling parent rewriting RevWalkTextBuiltin: Add -n to limit number of commits returned
| * Do not rewrite parents in RevWalkTextBuiltinsDave Borowitz2014-05-051-4/+8
| | | | | | | | | | | | | | | | Default behavior of C git is to skip parent rewriting unless particular history simplification or --parents flags are passed. Since JGit has no such flags, JGit should not rewrite parents. Change-Id: I9ba0e70fe6d5f49f975b71eea46f93198900f37d
| * RevWalk: Allow disabling parent rewritingDave Borowitz2014-05-053-3/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, setting any TreeFilter on a RevWalk triggered parent rewriting, which in the current StartGenerator implementation ends up buffering the entire commit history in memory. Aside from causing poor performance on large histories, this does not match the default behavior of `git rev-list`, which does not rewrite parent SHAs unless asked to via --parents/--children. Add a new method setRewriteParents() to RevWalk to disable this behavior. Continue rewriting parents by default to maintain backwards compatibility. Change-Id: I1f38e05526071c75ca58095e312663de5e6f334d
| * RevWalkTextBuiltin: Add -n to limit number of commits returnedDave Borowitz2014-05-051-1/+5
| | | | | | | | | | | | Implementing the -<#> flag from C git is less trivial. Change-Id: Idb55a303304a6d4055aaf37d0b4dcf92c684e25f
* | Allow callers to use different merging strategiesLaurent Goubet2014-05-066-14/+96
| | | | | | | | | | Signed-off-by: Laurent Goubet <laurent.goubet@obeo.fr> Change-Id: I84e9d7b4b772b4ad7d3e7010aad78291d4d178fe
* | Prepare 3.4.0-SNAPSHOT buildsMatthias Sohn2014-05-0655-59/+59
|/ | | | Change-Id: I5cf20c875c3e92e12c2b22465774ba42513b9add Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v3.4.0.201405051725-m7v3.4.0.201405051725-m7Matthias Sohn2014-05-0555-59/+59
| | | | | Change-Id: I8d941d22becdf019199a1c0fe28aa5835038647d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge "Make the resolve merger slightly more sub-classable."Robin Rosenberg2014-05-051-29/+125
|\
| * Make the resolve merger slightly more sub-classable.Laurent Goubet2014-03-061-29/+125
| | | | | | | | | | Change-Id: I7d2a90288696ee66887cc01d8a3ec2f6f28a0339 Signed-off-by: Laurent Goubet <laurent.goubet@obeo.fr>
* | Merge "blame: Fix merges, where merge result differs only by whitespace"Shawn Pearce2014-05-042-2/+34
|\ \
| * | blame: Fix merges, where merge result differs only by whitespaceKonrad Kügler2014-05-032-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When blaming a merge commit with "Ignore whitespace changes" enabled, don't discard blame candidates for other parents when we encounter a parent that only has whitespace changes compared to the merge result. The algorithm early prepares parents for blaming, removing the appropriate blame regions from the list of regions still to blame. Only at the end, the prepared blame candidates are submitted for blaming. When looking at a non-first parent which only differs in whitespace to the merge result, it submitted that parent, but only to blame it for the (usually few) lines not already prepared to blame on other parents. Due to an early return the blame candidates for the previous parents were forgotten, leaving many lines unannotated. bug: 433024 Change-Id: I43c9caf2078b92b05e652dbed2192568907bf199 Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>
* | | Update 4.4 target to use Luna M7 orbit repositoryMatthias Sohn2014-05-041-5/+5
| | | | | | | | | | | | | | | Change-Id: I9a19d5584deef970cc00a7b58beae84d55b20ddf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | AbstractPlotRenderer: Make private methods static where applicableKonrad Kügler2014-05-031-3/+3
| | | | | | | | | | | | Change-Id: Iaf02502b02b2420c059f04bbe09254941301c727 Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>
* | | PlotLane: Use identity hashCode and equalsKonrad Kügler2014-05-033-18/+0
|/ / | | | | | | | | | | | | Using the lane position and other data for equals/hashCode is not useful. Change-Id: I7af151d8a84544a77a486474c8ac71dd80090c66 Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>
* | Fix push to repo with non-fetched refsJean-Jacques Lafay2014-04-302-3/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When JGit uses bitmaps (which is the case after a gc), the push command doesn't go through the code where MissingObjectExceptions are caught for remote objects not found locally. Fixed by removing earlier non-locally-found remote objects. This was seen withing gerrit, see: https://code.google.com/p/gerrit/issues/detail?id=2025 Bug: 426044 Change-Id: Ieda718a0530e3680036edfa0963ab88fdd1362c0 Signed-off-by: Jean-Jacques Lafay <jeanjacques.lafay@gmail.com> Signed-off-by: Doug Kelly <dougk.ff7@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Make org.eclipse.jgit.packaging a general projectRobin Rosenberg2014-04-281-0/+40
| | | | | | | | | | | | This makes it easy to edit the pom.xml from within Eclipse. Change-Id: I4718217caadbfe892b7cbb557e0d3d6b40d48321 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge changes I2515a6ed,Ib6b24035Matthias Sohn2014-04-273-6/+94
|\ \ | | | | | | | | | | | | | | | * changes: Fix ArrayIndexOutOfBoundsException in CreateBranchCommand Add methods to Repository to handle remote names
| * | Fix ArrayIndexOutOfBoundsException in CreateBranchCommandRobin Rosenberg2014-04-271-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If remote name contains / or there was a branch directly under the refs/remotes namespace (wrong) the computation of remote name and suggested local branch name would fail. Fix this by looking at the configured remotes. A ref under refs/remotes that does not match a remote configuration is not considered a remote tracking branch anymore. This patch does not fix all similar errors in EGit/JGit. Bug: 411002 Bug: 400414 Change-Id: I2515a6ed05f9104c387ce4e43b24dae942ae2473
| * | Add methods to Repository to handle remote namesRobin Rosenberg2014-04-272-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of requiring the caller to know how to list remote names or parse remote branch names, add a few utilities for that. Change-Id: Ib6b2403532f4abbce594a03c0b9da49d30b19f70 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* | | Fix BlameResult.computeRange JavaDoc to exclude end indexKonrad Kügler2014-04-261-2/+2
|/ / | | | | | | Change-Id: Ifd7dd86e3848eb7a522ba5c49d5c216777484f3b Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>
* | Add API to permit the setting of additional HTTP headersBogdan Gheorghe2014-04-252-0/+157
| | | | | | | | | | Signed-off-by: Bogdan Gheorghe <gheorghe@ca.ibm.com> Change-Id: I1047f318bb5c63850f45ba85d73c97fe8bf70a6c
* | cleanup: remove some unused importsRobin Rosenberg2014-04-251-4/+0
| | | | | | | | Change-Id: I549b934b86753acc362364c8986bfe6457affd12
* | Making ArchiveFormats breaks the API, but that's okRobin Rosenberg2014-04-251-0/+38
| | | | | | | | | | | | Add compatibility filters to hide the breakage. Change-Id: Icc1fdc29f15d734d488e49c9c37a18f5ac937903
* | Add jacoco instrumentation for code coverage reportsMatthias Sohn2014-04-261-0/+31
| | | | | | | | | | | | | | See http://mickaelistria.wordpress.com/2012/10/08/sonar-at-eclipse-org/ Change-Id: Idd7df8125e0792e9bba924eadbc1320230cfa624 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge changes Ia4df9808,I83e8a321,Id0e7663b,Ib809b00c,I88a6ee07Shawn Pearce2014-04-2511-0/+942
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Commit changes generated during repo command Added implementation of copyfile rule. Added groups support to repo subcommand. Added the command line of jgit repo. Implemented first part of the repo sub-command.
| * | Commit changes generated during repo commandYuxuan 'fishy' Wang2014-04-253-5/+16
| | | | | | | | | | | | Change-Id: Ia4df9808294d2069dcc5973bcb69b4499c7dcacd Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
| * | Added implementation of copyfile rule.Yuxuan 'fishy' Wang2014-04-234-5/+111
| | | | | | | | | | | | | | | Change-Id: I83e8a3218be2984321342039fda507fdb1aa5f30 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
| * | Added groups support to repo subcommand.Yuxuan 'fishy' Wang2014-04-235-33/+279
| | | | | | | | | | | | | | | Change-Id: Id0e7663b6ac4f6938fdcacaf2158107b6285fc25 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
| * | Added the command line of jgit repo.Yuxuan 'fishy' Wang2014-04-236-0/+169
| | | | | | | | | | | | | | | Change-Id: Ib809b00c236a9c44422a872ae801b060f5b26808 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
| * | Implemented first part of the repo sub-command.Yuxuan 'fishy' Wang2014-04-235-0/+410
| | | | | | | | | | | | | | | | | | | | | | | | Currently the repo sub-command only "works", but the submodules will have .git directories themselves, and lacks group support. Change-Id: I88a6ee07109187c6c9bfd92a044775fcfb5befa6 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* | | Merge "Automatically reload known_hosts file"Shawn Pearce2014-04-251-0/+3
|\ \ \
| * | | Automatically reload known_hosts fileDoug Kelly2014-04-241-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JGit caches the contents of the known_hosts file within JSch when first started, and never attempts to re-read it. If the contents change (such as when using Gerrit replication), the new host will never be found. On failures, try reloading the knonwn_hosts and retry the connection, in addition to reloading the credentials. Change-Id: I980c4f4003f2a48c71b9b47c51e640d1e7742f58 Signed-off-by: Doug Kelly <dougk.ff7@gmail.com>
* / / Remove streaming delta support from JGitDoug Kelly2014-04-246-1000/+75
|/ / | | | | | | | | | | | | | | | | | | | | | | Streaming packed deltas is so slow that it never feasibly completes (it will take hours for it to stream a few hundred megabytes on relatively fast systems with a large amount of storage). This was indicated as a "failed experiment" by Shawn in the following mailing list post: http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg01674.html Change-Id: Idc12f59e37b122f13856d7b533a5af9d8867a8a5 Signed-off-by: Doug Kelly <dougk.ff7@gmail.com>
* | Merge "blame: Format commit and author only once per range"Shawn Pearce2014-04-231-13/+23
|\ \
| * | blame: Format commit and author only once per rangeShawn Pearce2014-04-211-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a commit is blamed for multiple lines of the result file the command line interface prints the same text before each line in that span. Format these strings once and reuse them as the line prefix. For long files (e.g. 2425 lines of ReceiveCommits.java in Gerrit) this can save as much as 20ms during the output phase of the command line blame program. Change-Id: Ie42787d77c8d0cbca7ccbf59c795120494a2a891
* | | Merge changes Icb1d49e5,I8bcab447,I3fa19b86,I2cda031b,I8b2dbf63Shawn Pearce2014-04-223-28/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | * changes: blame: Reuse existing blameEntireRegionOnParent method blame: Remove unnecessary curly braces around single statement if blame: Allow candidate to manage its setup before output blame: Do not update candidate regionList during output blame: Only use computeRange if -L was requested
| * | blame: Reuse existing blameEntireRegionOnParent methodShawn Pearce2014-04-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Skipping directly to the parent is already possible with an existing helper method. Update the source path (to follow the rename) and then use the existing code path to push the parent inside the current entry. Change-Id: Icb1d49e53d14b599efc478990613625a9e058e09
| * | blame: Remove unnecessary curly braces around single statement ifShawn Pearce2014-04-211-2/+1
| | | | | | | | | | | | Change-Id: I8bcab44785fe08bbf3519c634e57ebfea8d3f0f9
| * | blame: Allow candidate to manage its setup before outputShawn Pearce2014-04-212-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | Pass in the RevWalk and let the candidate decide how to prepare itself for output. This removes the conditional for the missing sourceCommit, as candidates missing a commit can override the method with a no-op. Change-Id: I3fa19b8676dfd3c177583f8f42593b5000b5350d
| * | blame: Do not update candidate regionList during outputShawn Pearce2014-04-211-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | Instead of updating the candidate's regionList field to iterate through the linked list of regions, use a special purpose field in the BlameGenerator. This allows the candidate to be unmodified. Change-Id: I2cda031b59220ab603ef82050e741ecbbaa1953f
| * | blame: Only use computeRange if -L was requestedShawn Pearce2014-04-211-0/+4
| | | | | | | | | | | | | | | | | | | | | The computeRange method is inefficient for computing the entire file. If the entire file was selected ask for the entire file. Change-Id: I8b2dbf635e875cc125443dac50be121208646540
* | | pgm: Flush stderr during shutdownShawn Pearce2014-04-211-0/+2
|/ / | | | | | | | | | | | | | | If an error occurs in command line option parsing the error message may be stuck in a Java level buffer. Flush the stream to ensure everything is made available to the calling process or terminal. Change-Id: I55b16e43aa96fc81c1197121032f5cdd901d412c
* | Expose ReceiveCommand version of TrackingRefUpdateShawn Pearce2014-04-181-2/+9
| | | | | | | | | | | | | | | | | | If the caller uses a BatchRefUpdate to execute these (e.g. fetch) there may be more detailed status information inside of the command that was used to execute it. Allow the caller to obtain that status data from the ReceiveCommand version of the TrackingRefUpdate. Change-Id: I47209377fb8fcef0346d7678f1ab27f4790b49bc
* | Merge changes I483c40e8,Ib16d684d,I9fb25229,I5f7c4855,I36905959Shawn Pearce2014-04-186-50/+251
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: diff: Optimize single line edits blame: Reduce running time ~4.5% by skipping common subtrees blame: Micro optimize blob lookup in tree blame: Automatically increase commit abbreviation length Blame correctly in the presence of conflicting merges
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 01:10:01 +0000