summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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
|\
| * Require a DiffConfig when creating a FollowFilterDave Borowitz2013-05-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | The various rename detection options are an inherent part of the filter, similar to the path being followed. This fixes a potential NPE when a RevWalk with a FollowFilter is created without a Repository, since the old code path tried to get the DiffConfig from the RevWalk's possibly-missing repository. Change-Id: Idb273d5a92849b42935ac14eed73b796b80aad50
* | Extend the FS class for Java7Robin Rosenberg2013-05-041-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most important difference is that in Java7 we have symbolic links and for most operations in the work tree we want to operate on the link itself rather than the link target, which the old File methods generally do. We also add support for the hidden attribute, which only makes sense on Windows and exists, just since there are claims that Files.exists is faster the File.exists. A new bundle is only activated when run with a Java7 execution environment. It is implemented as a fragment. Tycho currently has no way to conditionally include optional features based on the java version used to run the build, this means with this change the jgit packaging build always needs to be run using java 7. Change-Id: I3d6580d6fa7b22f60d7e54ab236898ed44954ffd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix line endingsMatthias Sohn2013-05-031-82/+82
|/ | | | Change-Id: I61c9c173237a535da8576a9299bfd4bb29e8f56b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* ArchiveCommand: Add missing @since tagJonathan Nieder2013-04-301-0/+2
| | | | Change-Id: I9e48a1f82b747492bebb3ca65fd16f599e425e8b
* Merge "Cleanup imports and javadocs in ArchiveCommand"Robin Rosenberg2013-04-271-3/+6
|\
| * Cleanup imports and javadocs in ArchiveCommandRobin Rosenberg2013-04-271-3/+6
| | | | | | | | Change-Id: Icb1cd177e791cc646636a88c67fd9399dfc7030c
* | Delete CLIText strings previously used in iplog generatorJonathan Nieder2013-04-272-6/+0
| | | | | | | | | | | | | | The only callers using these strings were removed in commit 850e5bc24e31 (Delete the iplog generator, 2013-01-09). Change-Id: Ia4f81b29b8d00782ee559d69de3befc0a6c4d403
* | Merge "Make the Reflog a public API again"Robin Rosenberg2013-04-271-1/+1
|\ \ | |/ |/|
| * Make the Reflog a public API againRobin Rosenberg2013-04-261-1/+1
| | | | | | | | Change-Id: I8ced7098da5b345fd9af2fdfafd1ef6a44ccee0d
* | ArchiveCommand: Do not warn for unsupported file modeJonathan Nieder2013-04-263-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When ArchiveCommand is invoked directly on the command line, these warnings to stderr warning: mode of path/to/some/submodule ignored are a useful hint, but in the more usual case where an archive is being served by a server, the intended audience for that message cannot see stderr. Later it might be useful to accept a callback to return these warnings out of band. Change-Id: I22e79be69859176d85594031d67c6cb3371c4bd2
* | Add internal porcelain-style API for ArchiveCommandJonathan Nieder2013-04-264-124/+288
| | | | | | | | | | | | | | One step closer to exposing archive creation functionality in a org.eclipse.jgit.archive bundle. Change-Id: If0ebb2417a941d9d3fc0d3f444316d0d1c494ff3
* | Merge "archive: Release resources before returning"Shawn Pearce2013-04-261-18/+22
|\ \
| * | archive: Release resources before returningJonathan Nieder2013-04-261-18/+22
| |/ | | | | | | | | | | | | | | The only caller exits immediately after calling execute() so this shouldn't make a difference, but it's good practice and should make it easier to expose the functionality in a public API later. Change-Id: Ia6cd2ce8382f1a62e576409107fc5c9a6b321fb6
* / status: Print conflict description for unmerged pathsRobin Stocker2013-04-193-5/+63
|/ | | | | | | Prefix unmerged paths with conflict description (e.g. "both modified:"), the same way C Git does. Change-Id: I083cd191ae2ad3e2460aa4052774aed6e36c2699
* Remove some unnecessary dependencies on FileRepostoryRobin Rosenberg2013-04-181-6/+7
| | | | | Change-Id: Ib6ee3a2874a7e2240aa68f4ac32d00c4d1fab5ae Signed-off-by: Chris Aniszczyk <zx@twitter.com>
* Make recursive merge strategy the default merge strategyMatthias Sohn2013-04-151-1/+1
| | | | | | | | Use recursive merge as the default strategy since it can successfully merge more cases than the resolve strategy can. This is also the default in native Git. Change-Id: I38fd522edb2791f15d83e99038185edb09fed8e1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge "clean up merge squash and no-commit messages in pgm"Christian Halstrick2013-04-092-1/+2
|\
| * clean up merge squash and no-commit messages in pgmTomasz Zarna2013-04-082-1/+2
| | | | | | | | Change-Id: Iffa6e8752fbd94f3ef69f49df772be82e3da5d05
* | Merge changes I8445070d,I38f10d62,I2af0bf68Matthias Sohn2013-04-081-1/+1
|\ \ | |/ |/| | | | | | | | | * changes: Fix plugin provider names to conform with release train requirement Add missing @since tags for new API methods DfsReaderOptions are options for a DFS stored repository
| * Fix plugin provider names to conform with release train requirementMatthias Sohn2013-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | According to release train requirements [1] the provider name for all artifacts of Eclipse projects is "Eclipse <project name>". [1] http://wiki.eclipse.org/Development_Resources/HOWTO/Release_Reviews#Checklist Change-Id: I8445070d1d96896d378bfc49ed062a5e7e0f201f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Detect and handle a checkout conflict during merge nicelyRobin Rosenberg2013-04-083-1/+17
|/ | | | | | Report the conflicting files nicely and inform the user. Change-Id: I75d464d4156d10c6cc6c7ce5a321e2c9fb0df375
* Add the no-commit option to MergeCommandTomasz Zarna2013-04-044-1/+16
| | | | | | | | | | Added also tests and the associated option for the command line Merge command. Bug: 335091 Change-Id: Ie321c572284a6f64765a81674089fc408a10d059 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Indicate initial commit on a branch in the reflogRobin Rosenberg2013-04-021-7/+1
| | | | | Bug: 393463 Change-Id: I4733d6f719bc0dc694e7a6a6ad2092de6364898c
* Fix @since tags in JGit, version 2.4 never existedTomasz Zarna2013-03-211-0/+10
| | | | Change-Id: Iaca88ec28b412e6b58e7b39a0762ba54b25f9471 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit 3.0: move internal classes into an internal subpackageShawn Pearce2013-03-1810-47/+44
| | | | | | | | This breaks all existing callers once. Applications are not supposed to build against the internal storage API unless they can accept API churn and make necessary updates as versions change. Change-Id: I2ab1327c202ef2003565e1b0770a583970e432e9
* Break the dependency on RevObject when creating a newObjectToPack().Colby Ranger2013-03-041-1/+1
| | | | | | | | | | Update the ObjectReuseAsIs API to support creating new ObjectToPack with only the AnyObjectId and Git object type. This is needed to support the future pack index bitmaps, which only contain this information and do not want the overhead of creating a temporary object for every ObjectId. Change-Id: I906360b471412688bf429ecef74fd988f47875dc
* Must use double single quotes around parametersRobin Rosenberg2013-02-161-5/+5
| | | | Change-Id: I34da782e6b9a492e3e291b36ef82f06ce8347660
* Add the --branch flag to the jgit clone commandRobin Rosenberg2013-02-163-2/+17
| | | | | | | --branch or -b allows the user to specify which branch to checkout after clone. Change-Id: Ie27533e5ecb43097862a8337a27a742b501e17a5
* Prepare 2.4.0-SNAPSHOT buildsMatthias Sohn2013-02-143-29/+29
| | | | | Change-Id: I4ab2baeb5d598d40d5dadfccdfe75152a1b9b7bf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Remove unused importsMatthias Sohn2013-02-141-4/+0
| | | | | | | These imports are unused since commit cb349da0174e77cc751e6cb8a16b327c4976b993 Change-Id: I74ea2a17bf4976d9c74255500e5deeff18208e87 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Remove unused availableRefs local from Clone.guessHEADJonathan Nieder2013-02-121-3/+0
| | | | | | | | This variable has been populated and never used ever since it was introduced in v0.4.9~336 (Add "jgit clone", 2008-12-23). Remove it to make the function easier to understand. Change-Id: Idb7eb80bc236a20f7385ad2d6141b4d1c5c3f1cc
* Delete the iplog generatorMatthias Sohn2013-01-097-237/+0
| | | | | | | | | | | It stopped working when we moved to the Eclipse foundation's Gerrit server since it doesn't use the Gerrit internal user store but LDAP. Instead, since 2.0, we use the Eclipse foundation's automatic IP log generator [1] to generate IP logs for releasing jgit and egit. [1] http://www.eclipse.org/projects/ip_log_selector.php Change-Id: I98dc65efb62909bc0258e6c680df0c93a57e9677 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* pgm: Attempt to detect a broken pipe and exit silentlyRobin Rosenberg2013-01-071-0/+12
| | | | | | | | | | | | | When piping output to another program, the other pipe may exit before we are done. An example is "jgit log|head". The result is that errno get set to EPIPE. Unfortunately Java does not have specific exception for this so we have to look at the exception message and hope that the number of variants are small. The detection here seem to work on Windows, Linux and OS X and it seems the message is usually not localized. Change-Id: Id6968ea7a53ae27ba5496303f1a479e41e41fdcc
* Declare essentially static methods as staticRobin Rosenberg2012-12-276-8/+11
| | | | Change-Id: I83ca25fb569c0dbc36eb374d5437fcf2b65a6f68
* Mark non-externalizable strings as suchRobin Rosenberg2012-12-2731-146/+145
| | | | | | | | | | A few classes such as Constanrs are marked with @SuppressWarnings, as are toString() methods with many liternal, but otherwise $NLS-n$ is used for string containing text that should not be translated. A few literals may fall into the gray zone, but mostly I've tried to only tag the obvious ones. Change-Id: I22e50a77e2bf9e0b842a66bdf674e8fa1692f590
* Add org.eclipse.jgit.pgm.Reset to commands catalogTomasz Zarna2012-12-221-0/+1
| | | | | Change-Id: I7acfd051a07be889b27cfcfc1f396d86a9f86ab2 Signed-off-by: Tomasz Zarna <tzarna@gmail.com>
* Prepare 2.3.0 buildsMatthias Sohn2012-12-213-31/+31
| | | | | Change-Id: I0ca539e8cfe444f96c64dc56d1f0ef33b66e0cff Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Prepare post 2.2.0.201212191850-r buildsstable-2.2Matthias Sohn2012-12-213-3/+3
| | | | Change-Id: I1a0fe51c71551fcfc98f5dd435eb283fd661b77a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v2.2.0.201212191850-rv2.2.0.201212191850-rMatthias Sohn2012-12-203-3/+3
| | | | | Change-Id: Idc49f17d03886b6a1e61a94ff81e32625c8675d9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix hidden field warningMatthias Sohn2012-12-121-3/+3
| | | | Change-Id: Ic52527c32f8167db3c7bb7fa0297c86fee21da27 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix empty control block warningsMatthias Sohn2012-12-121-7/+8
| | | | Change-Id: I7c546fa89f5e1933cff6648b2e03e07db61273e8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Cleanup unused import and Java 6 syntax in ArchiveRobin Rosenberg2012-12-121-5/+0
| | | | | | | @Override for implementation of interface is Java 6. JGit's execution environment is still Java 5. Change-Id: I48d10b3bf81a60938da86e026053b2f3d5e24ad3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* archive: Add tar supportJonathan Nieder2012-12-043-2/+39
| | | | | | | | Unlike ZIP files, tar files do not treat symlinks as ordinary files with a different mode, so tar support involves a little more code than would be ideal. Change-Id: Ica2568f4a0e443bf4b955ef0c029bc8eec62d369
* archive: Add --format option that switches between formatsJonathan Nieder2012-12-044-19/+66
| | | | | | | Prepare for .tar support. Change-Id: Ieb07702da1a54b41ae764fbb425f70826907b593 Improved-by: Shawn O. Pearce <spearce@spearce.org>
* archive: Record executable and symlink bitsJonathan Nieder2012-12-041-4/+10
| | | | | | | | | | | Setting the mode for a zip entry is now as simple as "entry.setUnixMode(mode)", so do that. The test checks using the system's "zipinfo" command (from InfoZIP) that the mode has been recorded correctly on systems that happen to have a "zipinfo" command, using org.junit.Assume to distinguish them. Change-Id: I4236c102fd76f18d01b2dc926eeb9b9fa11a61b7
* [RFC] archive: Switch to commons-compress as ZIP archiverJonathan Nieder2012-12-033-6/+13
| | | | | | | | | | | | | | | | | The Apache Commons Compress library provides a similar interface to java.util.zip with some features not found in java.util.zip, including support for inclusion of metadata (file mode and symlink targets) and support for multiple file formats (zip, .tar.xz, etc). Use it, in preparation for making use of these features. No functional change intended yet. A previous version of this patch used plexus-archiver. That is a heavier-weight dependency and offers a less convenient interface. Thanks to James Moger and Chris Aniszczyk for advice. Change-Id: Id01146950bb9c18dae0169311e3cde2c3bfa675e
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 23:36:53 +0000