summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm
Commit message (Collapse)AuthorAgeFilesLines
* Add missing resources from source.. in build.propertiesTomasz Zarna2013-10-301-1/+2
| | | | | Change-Id: Ief9b84c07494bdb01ce16b4ae3353c5364cc6625 Signed-off-by: Tomasz Zarna <tomasz.zarna@tasktop.com>
* CLI fetch command should support --tagsKaloyan Raev2013-10-262-0/+16
| | | | | | | Bug: 419638 Change-Id: I1dc99fd38e678e091a1d141d741328f0dec1756a Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Merge "Add describe command to JGit command line interface"Robin Rosenberg2013-10-204-0/+79
|\
| * Add describe command to JGit command line interfaceMatthias Sohn2013-10-114-0/+79
| | | | | | | | Change-Id: I1560fd2be417361b3d2df15a27618053031bd873 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | CLI version command falls back to Bundle-VersionKaloyan Raev2013-10-121-3/+48
|/ | | | | | | | | | | If the version command cannot read the Implementation-Version of the containing JAR fall back to read the Bundle-Version header in MANIFEST.MF. This makes the command working also from the org.eclipse.jgit.pgm bundle and during development in a host IDE. Bug: 419087 Change-Id: I4269d1cbd9bf9fd8be6fb4463aecc1c434aa387b Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* List all supported formats in archive command's helpMatthias Sohn2013-10-101-1/+1
| | | | Change-Id: I4bd271cb348914642069239853488f4960444746 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge "Add support for --version in JGit CLI"Robin Stocker2013-10-102-1/+10
|\
| * Add support for --version in JGit CLIKaloyan Raev2013-10-092-1/+10
| | | | | | | | | | Bug: 419000 Change-Id: I43f5267182ea69d1f9abbff33136e0491c629071 Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>
* | Add resources/ as source folder in build.propertiesKaloyan Raev2013-10-101-1/+2
|/ | | | | | | | | This allows correct export of org.eclipse.jgit.pgm via the PDE Export wizard. Bug: 419089 Change-Id: I98765208edd7df59e262001dd01ed2b43e4475a9 Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>
* Propagate IOException where possible when getting refs.Colby Ranger2013-10-075-8/+22
| | | | | | | | | | Currently, Repository.getAllRefs() and Repository.getTags() silently ignores an IOException and instead returns an empty map. Repository is a public API and as such cannot be changed until the next major revision change. Where possible, update the internal jgit APIs to use the RefDatabase directly, since it propagates the error. Change-Id: I4e4537d8bd0fa772f388262684c5c4ca1929dc4c
* Prepare 3.2.0-SNAPSHOT buildsMatthias Sohn2013-10-033-33/+33
| | | | | Change-Id: Iac6cf7a5bb6146ee3fe38abe8020fc3fc4217584 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Prepare post 3.1.0 buildsstable-3.1Matthias Sohn2013-10-033-33/+33
| | | | | Change-Id: I306a3d40c6ddb88a16d17f09a60e3d19b0716962 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v3.1.0.201310021548-rv3.1.0.201310021548-rMatthias Sohn2013-10-023-4/+4
| | | | | Change-Id: I2170b13047d5eab7565f47f9feb1680e03b1ba09 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Prepare post 3.1.0 RC1 buildsMatthias Sohn2013-09-273-3/+3
| | | | | Change-Id: I060f2082ccd0c91905b6b29a49cc633a0b51a1f2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v3.1.0.201309270735-rc1v3.1.0.201309270735-rc1Matthias Sohn2013-09-273-3/+3
| | | | | Change-Id: I48202dd461110da25f9bc159c938311fff0669e0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Prepare re-signing pgm's ueberjar to avoid SecurityExceptionMatthias Sohn2013-09-241-0/+14
| | | | | | | | | | | | | | | | | Since we now sign all build artifacts immediately after creating them we need to re-sign the ueberjar created for jgit command line tool because the signatures of the individual jars are invalidated when repacking them into the ueberjar. Hence we need to exclude the signatures of the individual jars when using maven-shade-plugin to create the ueberjar. Also install the shaded plugin into maven repository and exclude osgi framework sources which were included unintentionally. See http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg02277.html Change-Id: Ia302e68a4b2a9399cb18025274574e31d3d3e407 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge branch 'stable-3.0'Matthias Sohn2013-09-171-2/+0
|\ | | | | | | | | | | | | | | * stable-3.0: JGit v3.0.3.201309161630-r Add org.eclipse.jgit.java7.source to jgit source feature Change-Id: I738afcfbc78ea1ac56d0d0ab7d4f7717167dd8dd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.3.201309161630-rv3.0.3.201309161630-rstable-3.0Matthias Sohn2013-09-163-4/+4
| | | | | | | | | | Change-Id: I73ff609ba681500394b5919f62cff9ec24a52756 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-3.0'Matthias Sohn2013-09-113-1/+10
|\| | | | | | | | | | | | | | | | | * stable-3.0: Prepare post 3.0.2 builds JGit v3.0.2.201311090911-r Change-Id: I99a7d1072285646f7fcd4169225c1fd249ad5e37 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.0.2 buildsMatthias Sohn2013-09-113-32/+32
| | | | | | | | | | Change-Id: Ie1bd951a2cb35d069c94dab4a62507115913764f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.2.201311090911-rv3.0.2.201311090911-rMatthias Sohn2013-09-113-3/+3
| | | | | | | | | | Change-Id: Ifaae2e3e2f1bb0504bf9e6d59983086ac19a540b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.0.2-rc2 buildsMatthias Sohn2013-09-043-3/+3
| | | | | | | | | | Change-Id: I0e4020326c6443ba7157c18b345160cf9e1e88a7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.2.201309041250-rc2v3.0.2.201309041250-rc2Matthias Sohn2013-09-043-3/+3
| | | | | | | | Change-Id: Ie18ced75f573f140969af2a7d9edb45c76523715 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 3.0.2-SNAPSHOT buildsMatthias Sohn2013-08-193-32/+32
| | | | | | | | | | Change-Id: I3287609a90f068017cc62f4fd7738651e0663081 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.0.0.201306101825-r buildsMatthias Sohn2013-06-133-3/+3
| | | | | | | | | | Change-Id: I299cf1addc0987ffe39140d2216ab6a98e95ce52 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.0.201306101825-rv3.0.0.201306101825-rMatthias Sohn2013-06-113-3/+3
| | | | | | | | | | Change-Id: Ie8deab94c6263b5198f0bcb4533b1cfb3f5724b1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.0.0 RC3 buildsMatthias Sohn2013-06-043-3/+3
| | | | | | | | | | Change-Id: I008d55e2ef0aac9d1877b05ba73e3cf26335d430 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.0.201306040240-rc3v3.0.0.201306040240-rc3Matthias Sohn2013-06-043-3/+3
| | | | | | | | | | Change-Id: I8b782e9ebe03e5f72611a21a76d80c6b20cb7845 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.0.0-rc2 buildsMatthias Sohn2013-05-293-3/+3
| | | | | | | | Change-Id: Ic46832bcde80d0bf74c16cb094abd76b00552d14 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.0.201305281830-rc2v3.0.0.201305281830-rc2Matthias Sohn2013-05-293-3/+3
| | | | | | | | | | Change-Id: I490ad8cc7590f70783d3fbd6dd6f0e0446ae5afe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.0.0 M7 buildsMatthias Sohn2013-05-083-3/+3
| | | | | | | | Change-Id: I062c44529c7ae2f960d3c64a0923a45d2dc8a863 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.0.201305080800-m7v3.0.0.201305080800-m7Matthias Sohn2013-05-083-3/+3
| | | | | | | | | | Change-Id: I377b174993862918a117f54e6cba4733dfc2307c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add missing usage texts for JGit commandline commandsMatthias Sohn2013-09-0922-12/+73
| | | | | | | | | | | | | | Also update help text for the merge command now supporting recursive strategy as the default merge strategy. Change-Id: I07886fe875c407e2244f562c003bb9d04f398026 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add --quiet flag to pgm fetch.Colby Ranger2013-08-052-1/+6
| | | | | | | | Change-Id: If141fdc5c181b3a618b7e286ad3c6957211d0afc
* | Add path option to StatusCommandChristian Halstrick2013-07-211-1/+10
| | | | | | | | | | | | | | | | | | Allow filtering of the status. Only files which match given paths are inspected and only their state is reported. Change-Id: I3c4b1b46bf297cd4ebdb4997cfa14c8752a36411 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | Move gc to package org.eclipse.jgit.pgmMatthias Sohn2013-06-222-3/+2
| | | | | | | | | | | | | | All bugs reported for gc have been fixed and it seems we reached a stable implementation. Change-Id: I78a96ee2103beb48325da0f6ee10b2498bdc0267 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Disable warning about assigning to parameterRobin Stocker2013-06-151-1/+1
| | | | | | | | | | | | | | | | | | See change I08bed4275af9ec52aa4d7054067ac82f6a3c9781, where fixing such warning lead to complaints. If fixing is not wanted, disable it instead. Change-Id: If31d4028fa1c6377a11e83ed5688b45701cec68b
* | Prepare 3.1.0-SNAPSHOT buildsMatthias Sohn2013-06-133-33/+33
| | | | | | | | | | Change-Id: I7490a7c9558423c03e3c167ad55b9a98be9d99d9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add support for "jgit archive --output=<filename>"Jonathan Nieder2013-06-061-6/+29
| | | | | | | | | | | | | | | | | | | | If the --format option is not given and the output filename is, then infer the format from that filename. Otherwise match "git archive" by defaulting to tar (this is a change from the existing "jgit archive" default behavior, which was to default to zip). Change-Id: I5806bc48a403d05e4cfc3c180b82b33ad7cfae7f
* | Remove unused import in ArchiveJonathan Nieder2013-05-291-1/+0
| | | | | | | | Change-Id: I0bc82e74f4acedb059322c29e13352151165ef7f
* | Move FormatActivator.start()/stop() to a separate classJonathan Nieder2013-05-291-2/+2
| | | | | | | | | | | | | | | | | | This makes the functionality of registering all formats from the org.eclipse.jgit.archive package available in contexts where FormatActivator cannot be built because the OSGi core framework is not readily available to build against. Change-Id: If8e3487e933783a7e12f8e1838cbfe0b5862ce80
* | Maintain list of archive formats in one placeJonathan Nieder2013-05-281-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Add a static start() method to FormatActivator to allow outside classes such as the Archive subcommand of the jgit program to use it without a BundleContext. This way, the list of formats only has to be maintained in one place. While at it, build a list of registered formats at start() time, so stop() doesn't have to repeat the same list of formats. Suggested-by: Shawn Pearce <spearce@spearce.org> Change-Id: I55cb3095043568740880cc9e4f7cde05f49c363c
* | Release ArchiveCommand's ObjectReader in call()Jonathan Nieder2013-05-241-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make call() release all private resources so instead of using a pattern like ArchiveCommand cmd = git.archive(); try { cmd.setTree(tree) . ... .call(); } finally { cmd.release(); } callers can just use git.archive().setTree(tree)....call() directly. This involves pushing more work out of parameter setters and into call() so the ObjectReader is not allocated and potentially leaked before then. Change-Id: I699f703c6302696e1cc276d7ab8ee597d82f2c5d
* | Move ArchiveCommand into standard porcelain APIJonathan Nieder2013-05-249-542/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow use of ArchiveCommand without depending on the jgit command-line tools. To avoid complicating the process of installing and upgrading JGit, this does not add a dependency by the org.eclipse.jgit bundle on commons-compress. Instead, the caller is responsible for registering any formats they want to use by calling ArchiveCommand.registerFormat. This patch puts functionality that requires an archiver into a separate org.eclipse.jgit.archive bundle for people who want it. One can use it by calling ArchiveCommand.registerFormat directly to register its formats or by relying on OSGi class loading to load org.eclipse.jgit.archive.FormatActivator, which takes care of registration automatically. Once the appropriate formats are registered, you can make a tar or zip from a git tree object as follows: ArchiveCommand cmd = git.archive(); try { cmd.setTree(tree).setFormat(fmt).setOutputStream(out).call(); } finally { cmd.release(); } Change-Id: I418e7e7d76422dc6f010d0b3b624d7bec3b20c6e
* | Remove dependency by ArchiveCommand on archive formatsJonathan Nieder2013-05-249-6/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide static registerFormat and unregisterFormat methods to allow formats to register themselves without the ArchiveCommand code being aware of them. Register the basic "zip" and "tar" support at bundle activation time (and deregister them when unloading the bundle). For anyone using this code as an OSGi plugin it should continue to just work. The jgit program does not load org.eclipse.jgit.pgm as an OSGi bundle, so let the Archive command register the formats it uses explicitly with registerFormat. Change-Id: Id39c03ea6923d0aed8316ed7b6bd04d5ced570a7
* | Drop dependency by ArchiveCommand.Format interface on commons-compressJonathan Nieder2013-05-233-18/+27
| | | | | | | | | | | | | | | | Otherwise, anyone trying to implement a new format would have to depend on commons-compress, even if using a different underlying library to write the archive. Change-Id: I301a1997e3b48aa7e32d693fd8f4b2d436c9b3a7
* | ArchiveCommand.Format: pass output stream as first argument to putEntryJonathan Nieder2013-05-233-9/+10
| | | | | | | | | | | | | | | | This is more consistent with other APIs where the output side is the first parameter to be analagous to the left-hand side of an assignment. Change-Id: Iec46bd50bc973a38b77d8367296adf5474ba515f
* | ArchiveCommand: make archive formats non-inner classesJonathan Nieder2013-05-236-81/+222
|/ | | | | | First step toward making ArchiveCommand itself format-agnostic. Change-Id: I3cff5fce28fa7a19e34f8291cfb5b62f16429713
* Move org.eclipse.jgit.pgm's resource bundle to internal packageMatthias Sohn2013-05-0646-34/+46
| | | | | | | | Translatable texts aren't API and shouldn't require maintenance of @since tags to prevent API warnings. Change-Id: I228ff37f17c0e792a6bc188c463a0d19138e88ac Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge "Require a DiffConfig when creating a FollowFilter"Shawn Pearce2013-05-051-6/+8
|\
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 17:28:14 +0000