aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable-4.11' into stable-5.0stable-5.0Matthias Sohn2019-09-031-0/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Prepare 4.11.10-SNAPSHOT builds JGit v4.11.9.201909030838-r Bazel: Update bazlets to the latest master revision Bazel: Remove FileTreeIteratorWithTimeControl from BUILD file BatchRefUpdate: repro racy atomic update, and fix it Delete unused FileTreeIteratorWithTimeControl Fix RacyGitTests#testRacyGitDetection Change RacyGitTests to create a racy git situation in a stable way Silence API warnings Change-Id: Ifb6a4dbea2f48fd2ffa66eb737d61920aefedfbd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 4.11.10-SNAPSHOT buildsstable-4.11Matthias Sohn2019-09-033-46/+46
| | | | | | | | | | Change-Id: Ic98bd87d96ce627d38e1ecc2c3cb28b517ab489e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v4.11.9.201909030838-rv4.11.9.201909030838-rMatthias Sohn2019-09-033-4/+4
| | | | | | | | | | Change-Id: Ie60468569074197d49e19cbd0ffaedfe88f3d74e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 4.11.9-SNAPSHOT buildsMatthias Sohn2019-04-193-46/+46
| | | | | | | | | | Change-Id: Ie0ef10159bac6daf4db3f68e8c0825bc1608e40f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v4.11.8.201904181247-rv4.11.8.201904181247-rMatthias Sohn2019-04-183-4/+4
| | | | | | | | | | Change-Id: I0356bde8fbb789faa74ed3635046f4fd0dce28de Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 4.11.8-SNAPSHOT buildsMatthias Sohn2019-03-133-46/+46
| | | | | | | | | | Change-Id: I92789b0c02e83786961b81556bf2faec5d26b0c1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v4.11.7.201903122105-rv4.11.7.201903122105-rMatthias Sohn2019-03-133-4/+4
| | | | | | | | | | Change-Id: I4fc62c304b5a8452ca72a3b305e5732a26120000 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 4.11.7-SNAPSHOT buildsMatthias Sohn2018-12-253-46/+46
| | | | | | | | | | Change-Id: I97dc0f4aeb51c2084f40531ceac84e90bf70608d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v4.11.6.201812241910-rv4.11.6.201812241910-rMatthias Sohn2018-12-253-4/+4
| | | | | | | | | | Change-Id: I21bfe7a76450184bce43cbe8ebcaa7891e4b12ed Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 4.11.6-SNAPSHOT buildsMatthias Sohn2018-10-203-46/+46
| | | | | | | | | | Change-Id: Ic823775aad59530f516602e7e848474d65763314 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v4.11.5.201810191925-rv4.11.5.201810191925-rMatthias Sohn2018-10-203-4/+4
| | | | | | | | | | Change-Id: I9d11536062de74775ca545c26f341610d0ddaeb2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 4.11.5-SNAPSHOT buildsMatthias Sohn2018-10-063-46/+46
| | | | | | | | | | Change-Id: Ifbe76e14264e8b547930e2320e8e81d728bd6e38 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v4.11.4.201810060650-rv4.11.4.201810060650-rMatthias Sohn2018-10-063-4/+4
| | | | | | | | | | Change-Id: I5700ebd341b6b997a7757b17e7d731c4ce608ec2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 4.11.4-SNAPSHOT buildsMatthias Sohn2018-09-183-46/+46
| | | | | | | | | | Change-Id: Id2f83eb3b2070637997cfece59f4f15698267908 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v4.11.3.201809181037-rv4.11.3.201809181037-rMatthias Sohn2018-09-183-4/+4
| | | | | | | | | | Change-Id: I6b57b02e41f02916127b1866d573a634d6f6d796 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 4.11.3-SNAPSHOT buildsMatthias Sohn2018-09-103-46/+46
| | | | | | | | | | Change-Id: I4f5dda6da3f6ecd9b99c1d9a220844c5402f1988 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v4.11.2.201809100523-rv4.11.2.201809100523-rMatthias Sohn2018-09-103-4/+4
| | | | | | | | | | Change-Id: I85dab173a94b3036ccf669c20b9dffb4af0922b4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Prepare 5.0.4-SNAPSHOT buildsMatthias Sohn2018-09-093-46/+46
| | | | | | | | | | Change-Id: Ib9042662c3f2a1544d597d476c5952c61767687b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | JGit v5.0.3.201809091024-rv5.0.3.201809091024-rMatthias Sohn2018-09-093-4/+4
| | | | | | | | | | Change-Id: I9e8e74a10dbb235b08c6a5e1b169c5cae440f129 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-4.11' into stable-5.0David Pursehouse2018-08-311-1/+1
|\| | | | | | | | | | | | | | | | | | | * stable-4.11: Bazel: Use hyphen instead of underscore in external repository names Bazel: Format all build files with buildifier 0.15.0 ChangeIdUtilTest: Remove unused notestCommitDashV Change-Id: I5ebb1058927ea5a478eae9e44b7d96f123a22523 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Merge branch 'stable-4.11' into stable-5.0Matthias Sohn2018-08-251-11/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Silence API warning for new ObjectIdSerializer introduced in 4.11.1 Ignore API warnings Fix photon target platform to use photon version of org.eclipse.osgi Update Photon orbit repository to R20180606145124 Suppress warning for trying to delete non-empty directory Fix fetching with duplicate ref updates Fetch(Process): should tolerate duplicate refspecs FetchCommandTest: test add/update/delete fetch Change-Id: I2497f99b7d0686a0e0f773c39c8725e813ce9d4a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 4.11.2-SNAPSHOT buildsMatthias Sohn2018-07-313-46/+46
| | | | | | | | | | Change-Id: I02630900ab131478b30abe68b2133d2c8a5a67ab Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v4.11.1.201807311124-rv4.11.1.201807311124-rMatthias Sohn2018-07-313-4/+4
| | | | | | | | | | Change-Id: Ic58a916d7e2c380b84690afa5e3517c6c178af8c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Prepare 5.0.3-SNAPSHOT buildsMatthias Sohn2018-08-013-46/+46
| | | | | | | | | | Change-Id: Iae9d763a65481b09af6e19b33e41375f27038357 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | JGit v5.0.2.201807311906-rv5.0.2.201807311906-rMatthias Sohn2018-08-013-4/+4
| | | | | | | | | | Change-Id: Iccb98c03a069fee85a52325e1ed22cba8b76bcd8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Prepare 5.0.2-SNAPSHOT buildsMatthias Sohn2018-06-223-46/+46
| | | | | | | | | | Change-Id: I65e83f39a4082278c4cb809dbb08d44a119cebe0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | JGit v5.0.1.201806211838-rv5.0.1.201806211838-rMatthias Sohn2018-06-223-4/+4
| | | | | | | | | | Change-Id: I594cd85d46698953c27da3687e4ec40aeb73b445 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Prepare 5.0.1-SNAPSHOT buildsMatthias Sohn2018-06-133-46/+46
| | | | | | | | | | Change-Id: Iadf12dbdd63ef17c3f712c0fc18495304aa35016 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | JGit v5.0.0.201806131550-rv5.0.0.201806131550-rMatthias Sohn2018-06-133-4/+4
| | | | | | | | | | Change-Id: Ia2d548676217250593c3f0c383aec19e12e5e4a4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | JGit v5.0.0.201806131210-rMatthias Sohn2018-06-133-4/+4
| | | | | | | | | | Change-Id: Iedccfcaf57c11822f1faf5d5195357de42b2a14e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Prepare 5.0.0-SNAPSHOT buildsMatthias Sohn2018-06-053-4/+4
| | | | | | | | | | Change-Id: I9acca328146aa7100fbc1b457fcb1f8fd87cf52a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | JGit v5.0.0.201806050710-rc3v5.0.0.201806050710-rc3Matthias Sohn2018-06-053-4/+4
| | | | | | | | | | Change-Id: Ic7a6a87dd3a21351e60fbf6cd330456adf1f6800 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Prepare 5.0.0-SNAPSHOT buildsMatthias Sohn2018-05-303-4/+4
| | | | | | | | | | Change-Id: I9c4a0465f8e85041d24da97f4b4c7ad5f5eed3e4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | JGit v5.0.0.201805301535-rc2v5.0.0.201805301535-rc2Matthias Sohn2018-05-303-4/+4
| | | | | | | | | | Change-Id: Ifad678794525c01838b03e52bada66e1c089c5ae Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Prepare 5.0.0-SNAPSHOT buildsMatthias Sohn2018-05-233-4/+4
| | | | | | | | | | Change-Id: Ie343ccf37f46168041046500a2e19acc80814cfe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | JGit v5.0.0.201805221745-rc1v5.0.0.201805221745-rc1Matthias Sohn2018-05-223-4/+4
| | | | | | | | | | Change-Id: Ie2c35fab87f294b00f9754b07b60a848bf256b10 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Repository: Deprecate #peel methodDavid Pursehouse2018-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Callers should use getRefDatabase().peel(ref) instead since it doesn't swallow the IOException. Adapt all trivial callers to user the alternative. DescribeCommand still uses the deprecated method and is not adapted in this change since it will require more refactoring to add handling of the IOException. Change-Id: I14d4a95a5e0570548753b9fc5c03d024dc3ff832 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Remove further unnecessary 'final' keywordsHan-Wen Nienhuys2018-05-1820-48/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove it from * package private functions. * try blocks * for loops this was done with the following python script: $ cat f.py import sys import re import os def replaceFinal(m): return m.group(1) + "(" + m.group(2).replace('final ', '') + ")" methodDecl = re.compile(r"^([\t ]*[a-zA-Z_ ]+)\(([^)]*)\)") def subst(fn): input = open(fn) os.rename(fn, fn + "~") dest = open(fn, 'w') for l in input: l = methodDecl.sub(replaceFinal, l) dest.write(l) dest.close() for root, dirs, files in os.walk(".", topdown=False): for f in files: if not f.endswith('.java'): continue full = os.path.join(root, f) print full subst(full) Change-Id: If533a75a417594fc893e7c669d2c1f0f6caeb7ca Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
* | Remove 'final' in parameter listsHan-Wen Nienhuys2018-05-1528-56/+56
| | | | | | | | | | Change-Id: Id924f79c8b2c720297ebc49bf9c5d4ddd6d52547 Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
* | Bazel: Add a target to build jgit commandline toolJonathan Nieder2018-05-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works well enough for basic testing, especially the "jgit daemon" command: $ bazel build org.eclipse.jgit.pgm:jgit INFO: Analysed target //org.eclipse.jgit.pgm:jgit (39 packages loaded). INFO: Found 1 target... Target //org.eclipse.jgit.pgm:jgit up-to-date: bazel-bin/org.eclipse.jgit.pgm/jgit.jar bazel-bin/org.eclipse.jgit.pgm/jgit INFO: Elapsed time: 15.862s, Critical Path: 14.74s INFO: 42 processes: 32 linux-sandbox, 1 local, 9 worker. INFO: Build completed successfully, 60 total actions $ bazel-bin/org.eclipse.jgit.pgm/jgit rev-list HEAD^..HEAD 2>/dev/null e5ed926e02dd29b5e970d421b63b6921cc1800f5 Still to do: - suppress "Failed to load class "org.slf4j.impl.StaticLoggerBinder" output - add org.eclipse.jgit.pgm.test tests to bazel build - supply package information so that "jgit version" can work Change-Id: Ie89872839fa5aae974d5d39b6776b96332b0e83f
* | Rename RefDatabase#getAllRefs to getRefsJonathan Nieder2018-04-295-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is easier to type and makes it clearer that it only returns refs and not the pseudo-refs returned by getAdditionalRefs. It also puts us in a better position to add a method to the Repository class later that delegates to this one without colliding with the existing Repository#getAllRefs method that returns a Map<String, Ref>. While at it, clarify the javadoc of getRefs and hasRefs to make the same point. Suggested-by: David Pursehouse <david.pursehouse@gmail.com> Change-Id: I23497c66ac7b5e0c987b91efbc9e9cc29924ca66 Signed-off-by: Jonathan Nieder <jrn@google.com>
* | RefDatabase: add hasRefs convenience methodDavid Pursehouse2018-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callers can now say: db.getRefDatabase().hasRefs() rather than the more verbose: !db.getRefDatabase().getAllRefs().isEmpty() The default implementation simply uses getAllRefs().isEmpty(), but a derived class could possibly override the method with a more efficient implementation. Change-Id: I5244520708a1a7d9adb351f10e43fc39d98e22a1 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | RefDatabase: Introduce getAllRefs methodDavid Pursehouse2018-04-275-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | Currently to get all refs, callers must use: getRefsByPrefix(ALL) Introduce getAllRefs, which does this, and migrate all existing callers of getRefsByPrefix(ALL). Change-Id: I7b1687c162c8ae836dc7db3ccc7ac847863f691d Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Remove trivial cases of using deprecated RefDatabase.getRefs()Matthias Sohn2018-04-255-19/+14
| | | | | | | | Change-Id: I2d3e426a3391923f8a690ac68fcc33851f3eb419 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Configure WindowCache settings to use in JGit CLIMatthias Sohn2018-04-131-0/+10
| | | | | | | | | | | | | | Set the same defaults as in EGit. Use mmap to map git packfiles into memory. Change-Id: I7997b9123448a762192d7eeb55e01432549fba98 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix API problem filter warningsMatthias Sohn2018-03-251-0/+11
| | | | | | | | | | | | | | | | Silence warnings for bundles which haven't broken API since 4.11 but we increased major version to 5 since we always use the same version for all jgit bundles Change-Id: If4f9a6aa4ef21f9b511946c5fc4bd7c0af6094c4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | ShowPackDelta: Refactor to use try-with-resourceDavid Pursehouse2018-03-141-7/+8
| | | | | | | | | | | | | | | | Remove the resource warning suppression and refactor the code to open the TemporaryBuffer and InflaterInputStream in a try-with-resource. Change-Id: I3082e5ac7565c5000d5a4364f750dd0a0952fc6e Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | CommandCatalog: Simplify scan method using try-with-resourceDavid Pursehouse2018-03-131-21/+4
| | | | | | | | | | | | | | | | | | The IOExceptions caught in the nested try blocks are all ignored, so we can just wrap them all up into a single try-with-resource block. Change-Id: Id85850b3f54c408af73063220e6fead20cb0fd80 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Open auto-closeable resources in try-with-resourceDavid Pursehouse2018-03-132-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an auto-closeable resources is not opened in try-with-resource, the warning "should be managed by try-with-resource" is emitted by Eclipse. Fix the ones that can be silenced simply by moving the declaration of the variable into a try-with-resource. In cases where we explicitly call the close() method, for example in tests where we are testing specific behavior caused by the close(), suppress the warning. Leave the ones that will require more significant refcactoring to fix. They can be done in separate commits that can be reviewed and tested in isolation. Change-Id: I9682cd20fb15167d3c7f9027cecdc82bc50b83c4 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Implement --force option in FetchCommand and CLI fetch commandMatthias Sohn2018-03-132-0/+7
| | | | | | | | Change-Id: I42cdb57b8fb54ce466d1958391f12f911045327f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>