Matthias Sohn
4de2a9d57d
Add missing @since tag and silence API error
...
These methods were introduced for 4.11.1 so we have to silence the API
error adding API in a service release raises.
Change-Id: Ic847cebbed439912d3979ec2ec1809f77a28f61e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
7 years ago
David Pursehouse
61e4f16652
ObjectIdSerializer: Support serialization of known non-null ObjectId
...
The implementation of ObjectIdSerializer, added in change I7599cf8bd,
is not equivalent to the original implementation in Gerrit [1].
The Gerrit implementation provides separate methods to (de)serialize
instances of ObjectId that are known to be non-null. In these methods,
no "marker" is written to the stream. Replacing Gerrit's implementation
with ObjectIdSerializer [2] broke persistent caches because it started
writing markers where they were not expected [3].
Since ObjectIdSerializer is included in JGit 4.11 we can't change the
existing #write and #read methods. Keep those as-is, but extend the
Javadoc to clarify that they support possibly null ObjectId instances.
Add new methods #writeWithoutMarker and #readWithoutMarker to support
the cases where the ObjectId is known to be non-null and the marker
should not be written to the serialization stream.
Also:
- Replace the hard-coded `0` and `1` markers with constants that can
be linked from the Javadocs.
- Include the marker value in the "Invalid flag before ObjectId"
exception message.
[1] https://gerrit-review.googlesource.com/c/gerrit/+/9792
[2] https://gerrit-review.googlesource.com/c/gerrit/+/165851
[3] https://gerrit-review.googlesource.com/c/gerrit/+/165952
Change-Id: Iaf84c3ec32ecf83efffb306fdb4940cc85740f3f
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
Matthias Sohn
f389e18a28
Prepare 4.11.1-SNAPSHOT builds
...
Change-Id: Id9aa6b7e8f56de5183b6cd57ef0e790ec9debd4d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
7 years ago
Matthias Sohn
f944063517
JGit v4.11.0.201803080745-r
...
Change-Id: Ie24a33bc8a24c30db06fe7b175f405efb95776ec
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
7 years ago
Thomas Wolf
e00f59b7fe
Remove useless for(;;) loop
...
Change-Id: Ic9a7824cc178e92f44126acc8e77b0304b20ef4f
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
7 years ago
Thomas Wolf
7d3040368f
Fix DiffFormatter for diffs against working tree with autocrlf=true
...
The WorkingTreeSource produced an ObjectLoader that returned
inconsistent sizes: the file size in getSize(), but then a
correctly filtered smaller stream in openStream(). This resulted
either in an IOE "short read of block" or in an EOFException
depending on the resulting filtered size.
Fix this by ensuring that getSize() does return the size of the
filtered stream.
Bug: 530106
Change-Id: I7c7c85036047dc10030ed29c1d5a6c7f34f2bdff
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
7 years ago
Matthias Sohn
0d79bcf151
Merge branch 'stable-4.10'
...
* stable-4.10:
Don't subclass ThreadLocal to avoid memory leak in NLS
Set context classloader to null in WorkQueue
Change-Id: Idacf9a15a27f8e1d73357a80ed11a02237eea49e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
7 years ago
Markus Duft
0f9ec9e406
LFS: Adjust some API to make integration into tools (EGit,...) easier
...
Make the install command accessible without requiring reflection.
Expose the isEnabled(Repository) API to be able to check if calling the
install command is required for a repository.
Change-Id: I17e6eaefb6afda17fea8162cbf0cb86a20506753
Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
7 years ago
David Pursehouse
9f689e90d4
MergeHeadMsgTest: Open FileOutputStream in try-with-resource
...
Change-Id: I8efa549b98bf661665dc29d48d0e5661b0e8530c
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
2c29af7867
MergeCommand: Open RevWalk in try-with-resource
...
Change-Id: I45ce481cc198b8dc78e9c46b433504840597e982
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
057a295f0c
MeasurePackSizeTest: Open Transport in try-with-resource
...
Change-Id: If9a39f8eabe1cd3474bdc025ac92218cd2dd1640
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
658c7c179d
LongObjectIdTest: Open OutputStreamWriter in try-with-resource
...
Change-Id: Ic7c2109204f94c70b933191b46d4a8f2c16a1533
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
ee4dd50b3f
JschConfigSessionFactory: Open FileInputStream in try-with-resource
...
Change-Id: I0f8f4629c93ed747f2f604538fccc52da3974b2e
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
3195d2fb9b
CommandCatalog: Use StandardCharsets.UTF_8
...
Change-Id: I7c3356335cfedd81f663fd528799fc57b95fcf0f
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
f91ce7faad
JGitTestUtil: Open auto-closeable resources in try-with-resource
...
Change-Id: Ibc8dd8509109708628e5189888fa528add486452
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
0b4e781f7c
Use StandardCharsets.UTF_8 in tests
...
Replace hard-coded "UTF-8" string with the constant.
Change-Id: Ie812add2df28e984090563ec7c6e2c0366616424
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
2c5b721161
InfoRefsServlet: Open OutputStreamWriter in try-with-resource
...
Change-Id: Iaf93d5c020ee67e9effbe93334f1ad419ffaee1f
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
de96131d36
IndexDiffWithSymlinkTest: Open InputStream in try-with-resource
...
Change-Id: I5f49f80debb2259f665748408cd3604f869fa3ef
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
7b57ce5186
HugeFileTest: Open RandomAccessFile in try-with-resource
...
Change-Id: Iecb9a7348b40c91fa45c051c2a9c4eb47e4bdeca
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
b5115f6897
HookMessageTest: Open Transport in try-with-resource
...
Change-Id: Ie58b01a8a78e4f42a3b913708a545687c5c9f96b
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
6722f6927a
GitSmartHttpTools: Open OutputStream in try-with-resource
...
Change-Id: Ifb50b923f58f73d323cc1492950e58b6dc39f376
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
462f04a47d
GitServletResponseTests: Open Transport in try-with-resource
...
Change-Id: Ib74752c9185e38d0bfe9b4cef93b2427bf3afbd0
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
c6ea82b9cc
GetTextTest: Open InputStream in try-with-resource
...
Change-Id: I3b68686de2d852b1f0b19c267a4e527229b40316
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
e53edce867
GC: Open auto-closeable resources in try-with-resource
...
Change-Id: If437e14636de7c5014ee2aa419d6518acd857792
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
5f082de9bb
FileSnapshotTest: Open FileOutputStream in try-with-resource
...
Change-Id: I187dd61e3e7d6f141722bf1af86a7fe04711057d
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
07341b2947
FileSender: Open OutputStream in try-with-resource
...
Change-Id: I2278950998dffc2b5730a91a5bb3bcc38f4d446b
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
d1356bf238
FileRepository: Open FileInputStream in try-with-resource
...
Change-Id: Ief8aa4834437d76f7e636598bf9861312475e64a
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
03536cc2d0
FileLfsServlet: Open PrintWriter in try-with-resource
...
Change-Id: I6fa225e541c6d5c3dbf3d852a502f4e9c4f7d77e
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
336add10c1
FetchProcess: Open OutputStreamWriter in try-with-resource
...
Change-Id: Ide7768882a95f9e9706e50ca0774edd428dd07c1
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
fabd645fad
FS: Open TemporaryBuffer in try-with-resource
...
Change-Id: I52e048e491e838b7f762a5b5f4d148e91049877c
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
ae1a53a148
EditListTest: Open InputStream in try-with-resource
...
Change-Id: Ib5b86e332ec674dec5460a9629d94d9f94c31c24
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
209bb6ea94
EGitPatchHistoryTest: Open BufferedReader in try-with-resource
...
Change-Id: I74aede463c7b0a478a1e0e8b680c206d3964061d
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
159388b1a6
T0003_BasicTest: Use CommitBuilder.setEncoding(Charset)
...
Change-Id: I1c4cdd4b856d715a204030d2de25ef91977186c2
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
657e414824
WalkEncryptionTest: Use StandardCharsets.UTF_8
...
Change-Id: I6eb8a33be62c452c264fb0560b988144d80a41f9
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
751a08b2f4
GetTextTest: Use StandardCharsets constants instead of CharSet.forName
...
Change-Id: I61d626495338a89c014187c38a1f6b49accf7af4
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
8d845ec549
EGitPatchHistoryTest: Set input stream encoding with constant
...
Change-Id: Ieff9b1d07704e37c8d5616b220b015855a7cc624
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
da63121b0d
DirCacheIterator: Open InputStream in try-with-resource
...
Change-Id: I05d2d1de9a3d39466a6880f6e8107da8681876b1
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
ef9046fa89
DumbClientSmartServerTest: Open auto-closeable resources in try-with-resource
...
Change-Id: I599c6e274fe80af7bfd2205f56f469c22d1dd3e0
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
b9a03c69b3
DirCacheCheckoutTest: Open FileInputStream in try-with-resource
...
Change-Id: I3ceef36803752a19a4d74910b4db26c01279fd99
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
e3f8c0efb8
DiffFormatterReflowTest: Open InputStream in try-with-resource
...
Change-Id: Id7f420a2eac57e59fa3feb04236df6f5f8d07f02
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
e6c456eeae
Merge changes from topic 'try-with-resource'
...
* changes:
DiffCommand: Open DiffFormatter in try-with-resource
DiffAlgorithms: Open Repository in try-with-resource
DescribeCommandTest: Open FileWriter in try-with-resource
CommitCommand: Open InputStream in try-with-resource
DefaultNoteMerger: Open UnionInputStream in try-with-resource
7 years ago
David Pursehouse
e2d875ee30
DiffCommand: Open DiffFormatter in try-with-resource
...
Change-Id: I22bd1062d64b01bb98cdaf612482538114624b7f
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
6754fd0d95
Merge "Silence API error raised for new CONFIG_SECTION_LFS constant"
7 years ago
David Pursehouse
e466548235
DiffAlgorithms: Open Repository in try-with-resource
...
Change-Id: I67cb486283213f8aa964333533c55966518baa36
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
6d437a58f1
DescribeCommandTest: Open FileWriter in try-with-resource
...
Change-Id: Ida79bdae652faa88fbdb1b81e7e10b5019ff2c16
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
3393f78210
CommitCommand: Open InputStream in try-with-resource
...
Change-Id: I800a2afae17f84636cae593be7f07628fb8476c1
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
1826341793
DefaultNoteMerger: Open UnionInputStream in try-with-resource
...
Change-Id: I035aa89cdbf235992f41e752f49d735be4e5df0a
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
Matthias Sohn
e88f95146a
Silence API error raised for new CONFIG_SECTION_LFS constant
...
Change-Id: I27e68d245c6b9c972ab9470c14d1f45d15d4c253
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
7 years ago
David Pursehouse
06fbd7c5fa
CommitCommandTest: Open Repository in try-with-resource
...
Change-Id: Id9961a120ef9f949f04fc95455fae06ba95d8031
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago
David Pursehouse
f8cd892b27
CommitAndLogCommandTest: Open PrintWriter in try-with-resource
...
Change-Id: I0c7f07e27d1881d8856dac008110fcaa85c98fbb
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
7 years ago