summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ReflogWriterTest: Open FileInputStream in try-with-resourceDavid Pursehouse2018-03-051-4/+1
| | | | | Change-Id: Ie111aead49d83d6acfbb89bb475ef6d3159b36c4 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* TransportHttp: Open auto-closeable resources in try-with-resourceDavid Pursehouse2018-03-051-29/+14
| | | | | Change-Id: I2f713b79ff07f5759c189f384cd25adb9b9f5761 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* RebaseCommandTest: Open BufferedReader in try-with-resourceDavid Pursehouse2018-03-051-5/+2
| | | | | Change-Id: If8d77431edfdaec4a49a3c4ffe66a99e6d31c682 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* DirCacheCGitCompatabilityTest: Open BufferedReader in try-with-resourceDavid Pursehouse2018-03-051-10/+4
| | | | | Change-Id: I0494eb475954927743174941a7d6c06d8431f57f Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* LockFile: Open FileInputStream in try-with-resourceDavid Pursehouse2018-03-051-4/+1
| | | | | Change-Id: I0784266814225428a6a0070d1653c465d268b342 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* CheckoutCommandTest: Open FileInputStream in try-with-resourceDavid Pursehouse2018-03-051-8/+2
| | | | | Change-Id: I972958373ceaf4c3ae756559ccbc341506d4e72d Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* SmudgeFilter: Fix Integer boxing warningDavid Pursehouse2018-03-051-1/+2
| | | | | Change-Id: Ic00bcd25b0808a58880a4433d76b3b5a6a4ee5c7 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Add ConfigConstants.CONFIG_SECTION_LFSDavid Pursehouse2018-03-056-15/+27
| | | | | | | | | | | | | | DirCacheCheckout has a warning about non-localised string "lfs". Other classes use org.eclipse.jgit.lfs.lib.Constants but that is not visible to DirCacheCheckout. Add a new constant in ConfigConstants and use that in DirCacheCheckout. Replace existing uses of org.eclipse.jgit.lfs.lib.Constants.LFS with the new constant, except where it is referring to the folder name. Change-Id: I0f21b951babff9a2e579d68c4de0c62ee4bc23d4 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Return this from InstallLfsCommand.setRepository() to allow chainingMatthias Sohn2018-03-041-1/+5
| | | | Change-Id: I105f1f62f2dcdb20a196361190e9c9fe368e8613 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Upgrade spotbugs-maven-plugin to 3.1.2David Pursehouse2018-03-031-1/+1
| | | | | Change-Id: I01d8392ef8d20efd7f03590c82da017e2b53a043 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Update orbit to S20180302171354 (photon) and R20180206163158 (oxygen)Matthias Sohn2018-03-0410-26/+26
| | | | Change-Id: I5b5e59581bfa00bb16e3b8e0af6e154ad6583bb9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add|RemoveNoteComand: Reduce duplicated codeDavid Pursehouse2018-03-032-33/+7
| | | | | | | | | | The private method commitNoteMap is in both classes with the same implementation. Make it static in AddNoteCommand and reuse it from RemoveNoteCommand. Change-Id: Ia037bf9efdd94ee7b8d33b41321e9cfd6ea4a6a5 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* LFSPointerTest: Open ByteArrayOutputStream in try-with-resourceDavid Pursehouse2018-03-031-6/+7
| | | | | Change-Id: Ib15a838e735f8b960e0ed635d6d9b0caf97f4791 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* AbbreviationTest: Open FileOutputStream in try-with-resourceDavid Pursehouse2018-03-031-1/+4
| | | | | Change-Id: Id1d48da466251f9e4186f4674afba4b5901a4388 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* TagBuilder: Open OutputStreamWriter in try-with-resourceDavid Pursehouse2018-03-031-3/+2
| | | | | Change-Id: Ic0e23039b0aec6171f192234c6b1474cd32eadff Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* DaemonService: Open Repository in try-with-resourceDavid Pursehouse2018-03-031-12/+4
| | | | | Change-Id: I8deec91d91e82c7cb186cfa9507eb443dd87aad3 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* RefDirectory: Open BufferedReader in try-with-resourceDavid Pursehouse2018-03-031-23/+20
| | | | | Change-Id: I9239df3e381b141b48ad7ea1b706e5b5927946cd Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* ObjectDirectory: Open BufferedReader in try-with-resourceDavid Pursehouse2018-03-031-8/+2
| | | | | Change-Id: I4a44954c61647af1e48eade19112697e79297f2e Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Patch: Open TemporaryBuffer in try-with-resourceDavid Pursehouse2018-03-031-4/+4
| | | | | Change-Id: I90bff8d49ecc37b8c10ce909cd3ac563205b641c Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Enable warning for resources not managed by try-with-resourceDavid Pursehouse2018-03-0317-17/+17
| | | | | Change-Id: Iefe97de6bdb62af558f1b0e77c9205a9186f9b4c Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* LFS: Enable LFS support for the CLI, better error handlingMarkus Duft2018-03-037-5/+43
| | | | | | | | | | Enable LFS support for the CLI by registering the according filters. Errors during filter creation must be propagated up the call stack, as a failure to create a filter should be treated as fatal if the filter is required. Change-Id: I3833757839bdda97cd01b6c21c1613d199e2692d Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com>
* Cleanup stream usage WRT filtersMarkus Duft2018-03-036-33/+88
| | | | | | | | As it is right now some streams leak out of the filter construct. This change clarifies responsibilities and fixes stream leaks Change-Id: Ib9717d43a701a06a502434d64214d13a392de5ab Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* LFS: support merge/rebase/cherry-pick/diff/compare with LFS filesMarkus Duft2018-03-0325-93/+848
| | | | | | | | | | | | Respect merge=lfs and diff=lfs attributes where required to replace (in memory) the content of LFS pointers with the actual blob content from the LFS storage (and vice versa when staging/merging). Does not implement general support for merge/diff attributes for any other use case apart from LFS. Change-Id: Ibad8875de1e0bee8fe3a1dffb1add93111534cae Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge "LFS: Dramatically improve checkout speed with SSH authentication"Matthias Sohn2018-03-014-15/+108
|\
| * LFS: Dramatically improve checkout speed with SSH authenticationMarkus Duft2018-03-014-15/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSH Authentication is quite expensive (~120ms on localhost against Gerrit with LFS plugin). The SSH authentication typically also sends a validity time of the returned token, which allows to re-use it for a certain time, avoiding the expensive authentication on every download request. This improves checkout times by large factors depending on the LFS object amount/sizes. Also make sure that all instances of Gson used by LFS are configured in the same way. Change-Id: I422c94c37021b4322789b3829fa0185e25d683f2 Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com>
* | Correctly exit fetch negotiation for stateless RPC connectionsTerry Parker2018-02-281-0/+6
|/ | | | | | | | | | | | | Commit 9530c10192cf033c021802a3b295b06864654464 (2018-02-11) "Add a minimum negotiation feature for fetch" made fetch negotiation cheaper for repos with huge numbers of references (we are seeing a 15x reduction in maximum fetch times for chromium/chromium/src on trans-Pacific links). But it inadvertently broke the handling of stateless RPC connections, so fix that here. Change-Id: I0090aa76ffecc55801ebb833ac2e0c933a4a7c54 Signed-off-by: Terry Parker <tparker@google.com>
* LFS: pre-push upload supportMarkus Duft2018-02-2715-184/+837
| | | | | | | | | | | | If JGit built in LFS support is enabled for the current repository (or user/system), any existing pre-push hook will cause an exception for the time beeing, as only a single pre-push hook is supported. Thus either native pre-push hooks OR JGit built-in LFS support may be enabled currently, but not both. Change-Id: Ie7d2b90e26e948d9cca3d05a7a19489488c75895 Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* AmazonS3: Open OutputStream in try-with-resourceDavid Pursehouse2018-02-261-10/+5
| | | | | Change-Id: I0685a298a0f9fec465973cc718ae3bff373318a4 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* MergeGitAttributeTest: Open FileInputStream in try-with-resourceDavid Pursehouse2018-02-261-27/+17
| | | | | Change-Id: Iec85eea044c46a199b5b6f6bdbb3191d817dd441 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* PullCommandWithRebaseTest: Open File{Input|Output}Stream in try-with-resourceDavid Pursehouse2018-02-261-13/+2
| | | | | Change-Id: I1ff707ab7bab676603907f4c0bb1bc495503055b Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* RecursiveMergerTest: Open FileOutputStream in try-with-resourceDavid Pursehouse2018-02-261-33/+28
| | | | | Change-Id: I158333d6393fb807bc21fba23fec7ad474384471 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* PullCommandTest: Use try-with-resources for File{Input,Output}StreamDavid Pursehouse2018-02-261-13/+2
| | | | | Change-Id: I09242eb289655c7554aefa9e0817d9b881db656b Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Add ObjectIdSerializerDavid Pursehouse2018-02-252-0/+195
| | | | | | | | | | | | | | | This is based on the ObjectIdSerialization class written by Shawn Pearce for the Gerrit Code Review project in 2009 [1]. As mentioned in the commit message there, it should be part of core JGit. This implementation is slightly different to Shawn's version. Rather than having separate methods for null/non-null ids, single methods are implemented with @Nullable annotations. [1] https://gerrit-review.googlesource.com/c/gerrit/+/9792 Change-Id: I7599cf8bd1ecd546e2252783d6d672eb76804060 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* CheckoutCommandTest: Fix name of created temp fileDavid Pursehouse2018-02-251-1/+1
| | | | | Change-Id: I29048f83aee3848679bbc6ded09dd3dd4a2ea35b Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* IgnoreNodeTest: Suppress deprecation warnings in testEmptyIgnoreNodeDavid Pursehouse2018-02-251-0/+1
| | | | | Change-Id: I930c9408cc702af911419f2a7b3d03f652a2d4e3 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Fix warnings about boxing/unboxing BooleanDavid Pursehouse2018-02-252-4/+6
| | | | | Change-Id: I9d81d510282e9181267750fe3f9c571c35b61407 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* WorkingTreeIterator: Fix warnings about variable hidingDavid Pursehouse2018-02-251-4/+4
| | | | | Change-Id: I78ed3ae7aa30a7e7f146d0bd2e9feff74554da78 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* WorkingTreeIterator: Add NON-NLS suppressionsDavid Pursehouse2018-02-251-3/+3
| | | | | Change-Id: I369b8f68912134fc3880c162e9a2c5a1669bb4ac Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Merge "Fix processing of gitignore negations"Matthias Sohn2018-02-234-64/+439
|\
| * Fix processing of gitignore negationsMarc Strapetz2018-02-234-64/+439
| | | | | | | | | | | | | | | | | | | | Processing of negated rules, like !bin/ was not working correctly: they were interpreted too broad, resulting in unexpected untracked files which should actually be ignored Bug: 409664 Change-Id: I0a422fd6607941461bf2175c9105a0311612efa0 Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
* | Update tycho to 1.1.0Michael Keppler2018-02-231-1/+1
|/ | | | | | | The upgrade was already done 3 weeks ago, this version number was missing, however. Change-Id: Ibc794ba8035c46ea2160925b344ded5714b7c987 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
* Configure Semaphore used in TestRequestLog to be fairMatthias Sohn2018-02-221-1/+1
| | | | | Bug: 528187 Change-Id: I26c94ad7f802fc1dbe72d63a7ea346dc6e19ff94 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix indentation in TestRequestLogMatthias Sohn2018-02-221-75/+76
| | | | | | We use tabs to indent. Change-Id: I19b00e06becfb92fbabb99b5699385506fd85214 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* DfsReaderIoStats: Clarify that "blocks" are really cache missesDave Borowitz2018-02-221-5/+13
| | | | | | | | | | | | | The previous wording was ambiguous as to whether these were blocks requested from the cache (hits + misses) or read from underlying storage (misses only). They are in fact recording only misses: Accumulator#{readBlock,readBlockBytes,readBlockMicros} are only incremented from BlockBasedFile#readOneBlock, which is only called from the cache miss path in DfsBlockCache#getOrLoad (line 391). Change-Id: I0135cd1e76d09c1e28e0f1833b34c312511c66ce
* PathMatcher: fix handling of **/Marc Strapetz2018-02-2211-47/+185
| | | | | | | **/ should match only directories, but not files Change-Id: I885c83e5912cac5bff338ba657faf6bb9ec94064 Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
* Merge changes Id616611e,Ib6509e81,I52f5d3f2David Pursehouse2018-02-222-69/+190
|\ | | | | | | | | | | | | * changes: RepoCommand: generate relative submodule URLs from absolute URLs. RepoCommand: don't record new commit if tree did not change RepoCommand: persist unreadable submodules in .gitmodules
| * RepoCommand: generate relative submodule URLs from absolute URLs.Han-Wen Nienhuys2018-02-212-6/+60
| | | | | | | | | | | | | | | | If a manifest file specifies an absolute URL on the same host on which the superproject resides, rewrite the URLs to be relative. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Change-Id: Id616611e5195998fb665c8e7806539a3a02e219a
| * RepoCommand: don't record new commit if tree did not changeHan-Wen Nienhuys2018-02-192-2/+59
| | | | | | | | | | Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Change-Id: Ib6509e816684256d723558d5e8f3c37de58a2ff8
| * RepoCommand: persist unreadable submodules in .gitmodulesHan-Wen Nienhuys2018-02-192-63/+73
| | | | | | | | | | | | | | | | | | | | | | | | In cases where a manifest file mixes different remotes, a Gerrit server process may not have access to all remotes, and won't be able to produce a full submodule tree. Preserving this information in .gitmodules will let downstream clients reconstruct the full tree. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Change-Id: I52f5d3f288e771dca0af2b4dd3f3fa0f940dcf15
* | CGitIgnoreTest: also test untracked filesMarc Strapetz2018-02-211-5/+30
| | | | | | | | | | Change-Id: I21a4ebd63eaaa85aa2e68f99ef58c141189bdab4 Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>