aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm
Commit message (Collapse)AuthorAgeFilesLines
* Include slf4j and log4j in jgit command lineMatthias Sohn2015-03-232-0/+24
| | | | | | | | | | | | | This enables the command line to log. Include log4j configuration to log warnings and errors to stderr. Exclude the dependencies which log4j 1.2.15 should have marked optional. See http://unitstep.net/blog/2009/05/18/resolving-log4j-1215-dependency-problems-in-maven-using-exclusions/ for details Change-Id: Ie730db4007fb7614fd7d130cd0858b1ac550066a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge bundle org.eclipse.jgit.java7 into org.eclipse.jgitMatthias Sohn2015-03-231-17/+0
| | | | | | | As we moved minimum Java version to 7 we don't need a separate bundle and feature for JGit features depending on Java 7 anymore. Change-Id: Ib5da61b0886ddbdea65298f1e8c6d65c9879ced1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* CLI status should support --untracked-filesKaloyan Raev2015-03-124-11/+139
| | | | | | | | | | | | | | | | | | A special options handler is added to properly handle the short -u alias of the option. The "normal" mode is not supported by this patch, because this mode of listing untracked files is not supported by the org.eclipse.jgit.lib.IndexDiff class. This mode is not necessary for my use case. It can be added later if anyone really needs it. The StatusTest is updated to cover all possible combinations of the --porcelain and --untracked-files options. Bug: 459319 Change-Id: I305ac95739cfed0c16735e0987844e57fa27e236 Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add "--long" option to JGit describeChristian Halstrick2015-03-092-0/+6
| | | | | | | | | | | Native git supports "git describe --long". This will enforce returning a long description of a commit even if a tag is directly pointing to the commit (in contrast to just returning the tag name as it is now). This commit teaches JGits DescribeCommand and the describe command in the pgm package to support "--long". Bug: 460991 Change-Id: I65e179b79e89049c6deced3c71cb3ebb08ed0a8f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Move console classes to pgm bundleMatthias Sohn2015-02-107-68/+306
| | | | | | | | | Since we updated minimum Java version to Java 7 the console bundle doesn't need to be a separate bundle anymore. Move the contained classes to the pgm bundle which is using these classes. Change-Id: If8e6f2d7405fdfe6f4b178673b4ccf99c67d4b64 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Set minimum required Java version to Java 7Matthias Sohn2015-02-093-5/+5
| | | | | | Bug: 458475 Change-Id: Iea8f2236d4e6a94a8d14bb8cc685006ea3fd1bb7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge branch 'stable-3.7'Matthias Sohn2015-02-042-3/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.7: Add option --orphan for checkout Prepare post 3.7.0.201502031740-rc1 builds JGit v3.7.0.201502031740-rc1 Support for the pre-commit hook Fix FileUtils.testRelativize_mixedCase which failed on Mac OS X Add a hook test Introduce hook support into the FS implementations If a pack isn't found on disk remove it from pack list Conflicts: org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF Change-Id: I936acd24d47b911fa30ab29856094e1b2c6ac3db Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Add option --orphan for checkoutRüdiger Herrmann2015-02-042-3/+7
| | | | | | | | | | Change-Id: I546a93f3e147d8d6fc70094b22679c0d11cd8921 Signed-off-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de>
| * Prepare post 3.7.0.201502031740-rc1 buildsMatthias Sohn2015-02-043-4/+4
| | | | | | | | Change-Id: Id3728e771a4441757de016cc9d68055f668126b0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.7.0.201502031740-rc1v3.7.0.201502031740-rc1Matthias Sohn2015-02-033-4/+4
| | | | | | | | | | Change-Id: Ia2ea65945b7e1d4120da3d6e6c9f6d5fdb642ae6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Prepare 4.0.0-SNAPSHOT buildsMatthias Sohn2015-01-273-34/+34
|/ | | | | Change-Id: I414ba8ccc82866d3107ba7083a567ea70c879bdf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge "Make jgit.sh work on windows when JGIT_CLASSPATH is set"Shawn Pearce2015-01-271-2/+6
|\
| * Make jgit.sh work on windows when JGIT_CLASSPATH is setChristian Halstrick2014-12-011-2/+6
| | | | | | | | | | | | | | | | | | | | | | jgit.sh was concatenating classpath entries with ":". On Windows systems using "Git for Windows" this caused problems when JGIT_CLASSPATH was set. Find out whether we are running on a platform which name starts with "MINGW" ("Git for Windows" sets this) and use ";" as classpath separator in this case. Change-Id: I7e8fc2bee6513f587612accfc456a83d6277ef4a
* | [pgm] Prevent commands from writing progress to System.errRüdiger Herrmann2015-01-136-6/+6
| | | | | | | | | | | | | | | | | | Commands which report progress used to write to System.err. This is not desirable in cases where jgit.pgm is embedded. This change redirects progress output to the error stream that is configured by the command. Change-Id: I01fa5e167437e619448ac201fcb1cbf63bad96d7 Signed-off-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | [pgm] Add missing help text for clone --bare optionMatthias Sohn2015-01-071-0/+1
| | | | | | | | | | Bug: 456695 Change-Id: Ib6005e8453ecc871a9b72227e2593a3823f56010 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Prepare 3.7.0-SNAPSHOT buildsMatthias Sohn2014-12-243-34/+34
| | | | | | | | | | Change-Id: Ib3e7b5f46ee1e27b9cf25b3b2d01d681a5c4904c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-3.6'Matthias Sohn2014-12-247-170/+96
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.6: Prepare 3.6.1-SNAPSHOT builds JGit v3.6.0.201412230720-r [pgm] Add option --bare to clone command [pgm] Implement clone using CloneCommand Fix junit tests under windows when the platform is explicitly changed Fix unit tests for windows by explicitly closing test repos [pgm] Add option --tags for ls-remote [pgm] Add option --heads for ls-remote [pgm] Use LsRemoteCommand to implement ls-remote and add a test Change-Id: I8f31e76cb7e9416919f37e02c7e51ab1d221df40 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Prepare 3.6.1-SNAPSHOT buildsMatthias Sohn2014-12-233-34/+34
| | | | | | | | | | | | | | | Change-Id: Ie620c90ffafbffc6755b4e1ed55a61a15b118a2a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | JGit v3.6.0.201412230720-rv3.6.0.201412230720-rMatthias Sohn2014-12-233-4/+4
| | | | | | | | | | | | | | | Change-Id: Ic28e2bbbdb1099e948c64a005c39f6b8d8ac69a8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | [pgm] Add option --bare to clone commandMatthias Sohn2014-12-221-1/+4
| | | | | | | | | | | | Change-Id: I528491e3e20d3c9ebe37fe3cd2bf85b4644d8698 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | [pgm] Implement clone using CloneCommandMatthias Sohn2014-12-223-120/+33
| | | | | | | | | | | | Change-Id: I56699b7bf9a71f673cb308d3015f51de5b06c1d9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | [pgm] Add option --tags for ls-remoteMatthias Sohn2014-12-162-1/+5
| | | | | | | | | | | | | | | Bug: 444072 Change-Id: I52b470924609fc201e078d9d232aad257506728d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | [pgm] Add option --heads for ls-remoteMatthias Sohn2014-12-162-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | TODO: find a way to use option -h which is already captured by TextBuiltin's option --help which also uses the alias -h. Bug: 444072 Change-Id: Ie66584c2fc7fc224014a43cf928547703dd9d213 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | [pgm] Use LsRemoteCommand to implement ls-remote and add a testMatthias Sohn2014-12-151-16/+18
| |/ | | | | | | Change-Id: Ic266f844c23e2519df5770ca56284b26e4cfe1f4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* / Do not use deprecated tasks in maven-antrun-plugin.Alexander Kurtakov2014-12-091-4/+4
|/ | | | | | | | Maven-antrun-plugin deprecated tasks in favor of target, this patch fixes JGit poms to do the same. Change-Id: I420fd2ce88c61cf8e786ed45fbb8235dc30c124e Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
* Prepare post 3.6.0-m1 buildsMatthias Sohn2014-11-123-4/+4
| | | | | Change-Id: Ie9927de64fa6b7d517f96b8cd12e57541f284ff2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v3.6.0.201411121045-m1v3.6.0.201411121045-m1Matthias Sohn2014-11-123-4/+4
| | | | | Change-Id: I9d789113d88cbbbdbabb8919f80c805aa4ba86fe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* 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
|\
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 04:14:15 +0000