aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable-3.5'Matthias Sohn2014-09-261-0/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.5: Prepare 3.5.1-SNAPSHOT builds JGit v3.5.0.201409260305-r Fix PackWriterBitmapWalker handling non-existing uninteresting objects Enable maven site generation for jgit Generate javadocs as part of Maven site project reports Compare API changes with clirr against 3.4.1 [cli] Use chaining credentials provider to enable .netrc Add chaining credentials provider [Java 8] Configure doclint to accept missing descriptions Do not use .netrc implicitly if no CredentialsProvider was set Prepare post 3.5.0-rc1 builds JGit 3.5.0.201409071800-rc1 Fix the ls-remote command when there is no local repo Change-Id: Iaa4485cac6ff9c7917380e89e12e416e0f52a557 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 3.5.1-SNAPSHOT buildsMatthias Sohn2014-09-263-34/+34
| | | | | | | | | | Change-Id: Ibf89f996c9d9a7e431ee09261987bb76246de441 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.5.0.201409260305-rv3.5.0.201409260305-rMatthias Sohn2014-09-263-4/+4
| | | | | | | | | | Change-Id: Ibf382bda3dcbb4b70829b1dd3a8abfd07bc4879e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.5.0-rc1 buildsMatthias Sohn2014-09-083-4/+4
| | | | | | | | Change-Id: Id9e01b867bff0ed10e887c15a12e5399b788b68e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit 3.5.0.201409071800-rc1v3.5.0.201409071800-rc1Matthias Sohn2014-09-073-4/+4
| | | | | | | | | | Change-Id: I59e5e2492820da111df1837fbf3649a2ae03841c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Fix the ls-remote command when there is no local repoRobin Rosenberg2014-09-071-0/+5
| | | | | | | | | | Bug: 436695 Change-Id: I567f9a8e355c7624efa3efc9bac4f3b9015afa97 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add "aggressive" option to GCChristian Halstrick2014-09-192-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JGit should offer the possibility to do a garbage collection in "aggressive" mode. In this mode garbage collection more aggressively optimize the repository at the expense of taking much more time. Technically a aggressive mode garbage collection differs from a non-aggressive one by: - not reusing packed objects found in old packs. Recompress every object - the configuration pack.window is set to 250 (the default is 10) - the configuration pack.depths is set to 250 (the default is 50) The associated classes in org.eclipse.jgit.api and the command line command in org.eclipse.jgit.pgm expose this new option. The configuration parameters gc.aggressiveDepth and gc.aggressiveWindow have been introduced to configure this feature. Bug: 444332 Change-Id: I024101f2810acf6be13ce144c9893d98f5c4ae76
* | Prepare 3.6.0-SNAPSHOT buildsMatthias Sohn2014-09-053-34/+34
|/ | | | | Change-Id: I2d8c3768998c0cfc8d02d11009bc5b7ed1d75778 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Rename local variables/parameters to remove warnings about hidingRobin Rosenberg2014-09-041-3/+3
| | | | Change-Id: I73f38492b6a2e7fd6e77005efd0a8a8c65763e74
* Handle -m option for Merge commandAxel Richard2014-08-302-1/+9
| | | | | | | | | Set the commit message to be used for the merge commit (in case one is created) Bug: 442886 Change-Id: Ie5ecc13822faa366f00b3daa07f74c8441cae195 Signed-off-by: Axel Richard <axel.richard@obeo.fr> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Don't prefix output from jgit status with '# 'Robin Rosenberg2014-07-191-1/+1
| | | | | | C Git does not do it anymore Bug: 439937 Change-Id: I20bdb787a00bba3e4adf269fd64ec6296bdc2a66
* Handle diff formatting when there is nothing to compare withRobin Rosenberg2014-07-061-2/+3
| | | | | | | | DiffFormatter now suports either side being null and the log program will output the diff for the first commit. Bug: 395791 Change-Id: I378957b57e9ad1f7195ba416f402178453f0ebd3
* Don't warn for methods that can be staticRobin Rosenberg2014-07-021-1/+1
| | | | | | | | Making the methods static would gain little in performance, make the code harder to change. Removing unncessary warnings is more important. Change-Id: If3e6aa9c1d92e58b4e7a8e246cf4aace237d7a7b
* Add new default settings from Eclipse 4.4Robin Rosenberg2014-07-021-0/+5
| | | | | | | | These settings were added by Eclipse simply by touching the project settings. Adding these makes it simpler to see what local changes have been made. Change-Id: Iab0aa62530312eb0c78b03b5c6a632742bcc4978
* Clarify comments in message properties files (and fix grammar)Robin Stocker2014-06-301-2/+2
| | | | | | Bug: 438261 Change-Id: I7b98475886ef789ae7635d8c9e008fc1aa00d534 Signed-off-by: Robin Stocker <robin@nibor.org>
* Fix incorrect "''" in CLIText.propertiesRobin Stocker2014-06-301-1/+1
| | | | | | | | This message is not processed by MessageFormat. Bug: 438261 Change-Id: If75d8f3cd3f356a56623eee96b64e8845de5eb38 Signed-off-by: Robin Stocker <robin@nibor.org>
* Add a comment to the message properties files on how they are processedRobin Rosenberg2014-06-291-0/+5
| | | | Change-Id: I073f0c2c0729e6a5d3f1834203f0cfeb4c462eda
* Remove duplicate string in CLIText.propertiesRobin Rosenberg2014-06-291-1/+0
| | | | | Bug: 438261 Change-Id: Idd6839465ea36d072b1c4393f5abd2f39da02b62
* Fix formatting errors in error messagesRobin Rosenberg2014-06-291-2/+2
| | | | | | | | | {} is plain wrong and is not accepted by MessageFormat, the other risk becoming wrong if another single quote is introduced in the future and sets a bad example. Bug: 438261 Change-Id: I2948ca90c10f6ec2574f7f2b9be0a72821ea4daf
* Prepare 3.5.0-SNAPSHOT buildsRobin Rosenberg2014-06-043-34/+34
| | | | | Change-Id: I53bd500188e09ae2e007a58b3cd89aa0805d6f2a Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* Prepare post 3.4.0 RC1 buildsMatthias Sohn2014-05-213-4/+4
| | | | Change-Id: Ia8d29046439bc9134acdf7c88ab85ea49c4ddf47 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v3.4.0.201405211411-rc1v3.4.0.201405211411-rc1Matthias Sohn2014-05-213-4/+4
| | | | | Change-Id: Ia3834770b9719f64cbdfd0338034c392fa3ae5db Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge "Command line: implement checkout -- <path>"Matthias Sohn2014-05-161-4/+17
|\
| * Command line: implement checkout -- <path>Matthias Sohn2014-05-121-4/+17
| | | | | | | | Change-Id: I3d261e6541fe0fcaa210587d2aa226e153071351 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | LsTree: quote paths in outputDave Borowitz2014-05-071-1/+2
|/ | | | Change-Id: Ic78d5b41e057fcd3282e97ac73ed506666f28f88
* Fix manifests of source bundlesMatthias Sohn2014-05-071-2/+2
| | | | | | | | | | | | - 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-061-5/+13
|\ | | | | | | | | | | | | * 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
| * 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
* | Prepare 3.4.0-SNAPSHOT buildsMatthias Sohn2014-05-063-4/+4
|/ | | | Change-Id: I5cf20c875c3e92e12c2b22465774ba42513b9add Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v3.4.0.201405051725-m7v3.4.0.201405051725-m7Matthias Sohn2014-05-053-4/+4
| | | | | Change-Id: I8d941d22becdf019199a1c0fe28aa5835038647d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Added groups support to repo subcommand.Yuxuan 'fishy' Wang2014-04-232-0/+5
| | | | | Change-Id: Id0e7663b6ac4f6938fdcacaf2158107b6285fc25 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* Added the command line of jgit repo.Yuxuan 'fishy' Wang2014-04-234-0/+70
| | | | | Change-Id: Ib809b00c236a9c44422a872ae801b060f5b26808 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.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
* | 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
* blame: Automatically increase commit abbreviation lengthShawn Pearce2014-04-171-3/+17
| | | | | | | | | Ensure commit object names are unique by extending the default abbreviation as long as necessary. This allows `jgit blame` to more closely match the formatted output of `git blame` on large histories like Gerrit Code Review's ReceiveCommits.java file. Change-Id: I5f7c4855769ee9dcba973389df9e109005dcdb5b
* Avoid calls to System.exit() and throw an exception insteadGuillaume Nodet2014-04-023-2/+37
| | | | | | | | The exception is caught in Main and System.exit() is called. Bug: 413522 Change-Id: Ibe68f7104d4fd55b832000a7840c07a169e7dd58 Signed-off-by: Guillaume Nodet <gnodet@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add an input stream and an error stream to TextBuiltin base classGuillaume Nodet2014-03-3010-52/+88
| | | | | | | | Leverage these streams to remove calls to System.in and System.err Bug: 413522 Change-Id: I8396f3e273c93e23861e8bcfb2ab8182fb09220d Signed-off-by: Guillaume Nodet <gnodet@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Make sure we include the Java 7 module in tests when using JDK 8Robin Rosenberg2014-03-291-1/+1
| | | | Change-Id: Idfb3b16725d8f2ad25338dd0910fb1334c00cde4
* Implement "git branch --contains" in pgmRobin Stocker2014-03-072-17/+32
| | | | | | Bug: 425678 Change-Id: Ib59e05a0bde58562cc61e6e3000df761660b468e Signed-off-by: Robin Stocker <robin@nibor.org>
* Prepare 3.4.0-SNAPSHOT buildsMatthias Sohn2014-03-053-33/+33
| | | | | Change-Id: I907c6f1834c06b8ab4d3e0f76dde475faea7b4a5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge branch 'stable-3.3'Matthias Sohn2014-03-053-33/+33
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.3: Update scripts to deploy jgit on Maven central Prepare 3.3.1-SNAPSHOT builds JGit v3.3.0.201403021825-r Fix merge/cherry-picking in CRLF mode Expose the received pack size in ReceivePack Revert "Add getPackFile to ReceivePack to make PostReceiveHook more usable" Avoid an NPE after 7b01a5369210 Add a launcher for Java 7 tests Remove obsolete getRepositoryMethod from WorkingTreeIterator Fix NPE when WorkingTreeIterator does not have a repository set Add getPackFile to ReceivePack to make PostReceiveHook more usable Possibility to limit the max pack size on receive-pack Package httpclient and httpcore in o.e.j.http.apache.feature Change-Id: I814a150980854bbaabd767f97b062d247af6cb50 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 3.3.1-SNAPSHOT buildsMatthias Sohn2014-03-053-33/+33
| | | | | | | | Change-Id: If15560f2731e54dbf9db88d8a308b4c25ce27e8e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.3.0.201403021825-rv3.3.0.201403021825-rMatthias Sohn2014-03-033-3/+3
| | | | | | | | | | Change-Id: Iaf3da455f7d6f691617299e881154ff8185a9d46 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.3.0RC1 buildsMatthias Sohn2014-02-203-3/+3
| | | | | | | | | | Change-Id: I0d808f8733a490b75bbcaacedb4b095e05fab32e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.3.0.201402191814-rc1v3.3.0.201402191814-rc1Matthias Sohn2014-02-203-3/+3
| | | | | | | | | | Change-Id: Ida3a0417ae646ce37214153f49a85de2be3dd4fd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add missing @Deprecated to deprecated fields and methodsShawn Pearce2014-03-031-0/+1
| | | | | | | | | | | | | | | | Java spec requires the @Deprecated annotation on any deprecated field or method. Add the missing annotation to fields and methods already declared deprecated in the javadoc. Change-Id: Ic0ef24b43cfd99ac947e771ef5a28e493c304274
* | CLI clone command should support --no-checkoutKaloyan Raev2014-02-262-9/+16
|/ | | | | | | | doCheckout() is called only if --no-checkout option is not set. Bug: 428917 Change-Id: I350bef446dd7a37613b9506aae99679569bd36e1 Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add symlink support to JGitRobin Rosenberg2014-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | The change includes comparing symbolic links between disk and index, adding symbolic links to the index, creating/modifying links on checkout. The behavior is controlled by the core.symlinks setting, just as C Git does. When a new repository is created core.symlinks will be set depending on the capabilities of the operating system and Java runtime. If core.symlinks is set to true, the assumption is that symlinks are supported, which may result in runtime errors if this turns out not to be the case. Measuring the cost of jgit status on a repository with ~70000 files, of which ~30000 are tracked reveals a penalty of about 10% for using the Java7 (really NIO2) support module. Bug: 354367 Change-Id: I12f0fdd9d26212324a586896ef7eb1f6ff89c39c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>