aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable-4.1' into stable-4.2stable-4.2David Pursehouse2018-10-190-0/+0
|\ | | | | | | | | | | | | | | * stable-4.1: JGit v4.0.3.201509231615-r Change-Id: I6cc5bcefad2e8dee3394770d36608f981bfc9a9e Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * Merge branch 'stable-4.0' into stable-4.1stable-4.1David Pursehouse2018-10-190-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | * stable-4.0: JGit v4.0.3.201509231615-r Change-Id: Ie74b0392ef145ffd27dc903c45f7fec2d4492a17 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * JGit v4.0.3.201509231615-rv4.0.3.201509231615-rstable-4.0Matthias Sohn2015-09-2346-49/+49
| | | | | | | | | | | | | | | Change-Id: I7ec09e82d806cde61165a6ceb79de022f18d9fe2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge "Revert "Fix warnings about unchecked conversion of MergeResult"" into ↵Shawn Pearce2016-02-152-2/+2
|\ \ \ | | | | | | | | | | | | stable-4.2
| * | | Revert "Fix warnings about unchecked conversion of MergeResult"Shawn Pearce2016-02-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 979fa19110df0906a82e92e32d7d3ccf7eca3712. Breaks API. Change-Id: I54af657898d49f64d6906fe3edfb6b08e996d901
* | | | Merge changes I13672371,I95074358 into stable-4.2Shawn Pearce2016-02-151-1207/+1216
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: MergeCommandTest: Use JUnit's assume to check preconditions MergeCommandTest: Open Git instances in try-with-resource
| * | | | MergeCommandTest: Use JUnit's assume to check preconditionsDavid Pursehouse2016-02-121-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the assume method, instead of just returning, will cause the test to be marked as skipped rather than passed on systems where the precondition is not satisfied. Change-Id: I13672371f6cd3c481a0a6247e0eaed3aac6d766e Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | | | MergeCommandTest: Open Git instances in try-with-resourceDavid Pursehouse2016-02-121-1202/+1212
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I95074358cec6fef6b5ced7bb7b117c33fee08a7a Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | | Don't use deprecated LockFile constructorDavid Pursehouse2016-02-1512-31/+17
| |/ / / |/| | | | | | | | | | | | | | | Change-Id: Ibc3e2f3372e1a65732dd6d3c71cec53fb1aa15e2 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | Fix warnings about unchecked conversion of MergeResultDavid Pursehouse2016-02-152-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I1490b2209fa7b39676849c624adbc262a672f6df Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | MockServletConfig: Fix warning about unchecked conversion of EnumerationDavid Pursehouse2016-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic5ce6d220e3b644032819ce4b2f31c669be1cdb9 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | HugeFileTest: Make Git a class member and open in try-with-resourceDavid Pursehouse2016-02-151-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's only one test method in this module and it's quite long, so rather than using a try-with-resource and having to indent a huge block of existing code, make the Git a member variable that gets initialised and closed in @Before and @After annotated methods. The methods are named 'before' and 'after' rather than the conventional 'setUp' and 'tearDown' so as not to conflict with the names of the existing methods in LocalDiskRepositoryTestCase. Change-Id: I5a4a9b59f244c450dbcae9fdde7d9e0f0cd24e6f Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | Suppress "unchecked cast" warnings related to UploadPackFactory.DISABLEDDavid Pursehouse2016-02-152-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Id74694e18fec326df2b04eb796b46ccc6484b23f Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | DiffAlgorithms: Fix warnings about variable hidingDavid Pursehouse2016-02-151-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Local variables/parameters named 'db' and 'cmp' were hiding class member variables of the same name. Change-Id: I98b770587aaf73744a93e6a3ee33d131a9fa91e9 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | DirCacheBasicTest: Open ObjectInserter.Formatter in try-with-resourceDavid Pursehouse2016-02-151-3/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie4b3e5ad9616bc56b6d8d2476d1e6c6319c1a0aa Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | DirCacheBuilderIteratorTest: Open TreeWalk in try-with-resourceDavid Pursehouse2016-02-151-15/+16
| | | | | | | | | | | | | | | | | | | | Change-Id: I94836315918924cba9a2b5be6b9ae417cb2ad215 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | DirCacheCGitCompatabilityTest: Open TreeWalk in try-with-resourceDavid Pursehouse2016-02-151-11/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: I81a8bd2aba7eb0a6efaea5d6f7720aa725052157 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | DirCacheCheckoutMaliciousPathTest: Open Git and RevWalk in t-w-rDavid Pursehouse2016-02-151-60/+61
| | | | | | | | | | | | | | | | | | | | Change-Id: Iacb4e25f0ada74b1a01e448216cb02c7ec18b2d7 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | DirCacheIteratorTest: Open TreeWalk instances in try-with-resourceDavid Pursehouse2016-02-151-87/+94
| | | | | | | | | | | | | | | | | | | | Change-Id: If23597acaebf2295b85411bf87bc0292d5dc789e Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | ForPathTest: Open TreeWalk in try-with-resourceDavid Pursehouse2016-02-151-11/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie4d0eb9c0fe1d8b8f41da161e701137cd7dd178f Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | GitConstructionTest: Open Git instance in try-with-resourceDavid Pursehouse2016-02-151-5/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: Iddf658acd1c78161d6028cfcfb7e5c73534ae40b Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | IndexDiffTest: Open Git instances in try-with-resourcesDavid Pursehouse2016-02-151-334/+340
| | | | | | | | | | | | | | | | | | | | Change-Id: I7fa2d16561982ddfde053f2fe78135c114b66b1d Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | ManifestParserTest: Don't use deprecated StringBufferInputStreamDavid Pursehouse2016-02-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace it with ByteArrayInputStream as suggested in [1]. [1] http://stackoverflow.com/a/2219543/381622 Change-Id: I5ca8d721a756a82ea5f5687a20555303eb1dfc18 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | InMemoryRepository: Remove unused RevWalk from batch method signatureDavid Pursehouse2016-02-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RevWalk given in the arguments is not used. According to the comment at the top of the method, a new RevWalk is intentionally used in the implementation. Remove the unused argument. Change-Id: Iec81a1341d5bf377801475845b96a465753096ef Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | IndexModificationTimesTest: Open Git instances in try-with-resourceDavid Pursehouse2016-02-151-51/+52
| | | | | | | | | | | | | | | | | | | | Change-Id: If52c071b71f5df822b1ac276a6f665515f6c9d00 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | InterIndexDiffFilterTest: Open TreeWalk in try-with-resourceDavid Pursehouse2016-02-151-32/+37
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie0046771b1ab1c9784d9a3bb597a9d76c6c3017d Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | LockFileTest: Open Git instance in try-with-resourceDavid Pursehouse2016-02-151-17/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie2b0e55e606f50c46e21227f23de74dbea8388e5 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | | Merge branch 'stable-4.1' into stable-4.2David Pursehouse2016-02-150-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | * stable-4.1: JGit v4.1.2.201602141800-r Change-Id: I4156fd539da989c989aabce68d20dd9f8b5ad47c Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
| * | JGit v4.1.2.201602141800-rv4.1.2.201602141800-rMatthias Sohn2016-02-1446-49/+49
| | | | | | | | | | | | | | | Change-Id: If0721109f389835a3a00b1a97559fd8f8c156556 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | NoteMapTest: Open TreeWalk instances in try-with-resourceDavid Pursehouse2016-02-121-8/+12
| | | | | | | | | | | | | | | Change-Id: I70da0140fe087e7e69c28e9ddd125495d916ec1b Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | ObjectDirectoryTest: Fix warnings about variable hidingDavid Pursehouse2016-02-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | The variable and parameter named 'db' were hiding class members with the same name. Change-Id: I27017afdc5f49c38c6f5be494e7a21239ea601a7 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | PackWriterTest: Open RevWalk in try-with-resourceDavid Pursehouse2016-02-121-5/+6
| | | | | | | | | | | | | | | Change-Id: Ic8ed941d096718e81c7ffeb166bcf7faaa2ff57d Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | PatchIdDiffFormatterTest: Open Git and PatchIdDiffFormatter in try-with-resourceDavid Pursehouse2016-02-121-39/+43
| | | | | | | | | | | | | | | Change-Id: I39e898e52c3d9dffaba9dabf11c085503fbc1acf Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | PathSuffixFilterTest: Open TreeWalk in try-with-resourceDavid Pursehouse2016-02-121-9/+10
| | | | | | | | | | | | | | | Change-Id: If0ee71f09a5464e27f0496dac364f8f9bb015eb6 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | PostOrderTreeWalkTest: Open TreeWalk in try-with-resourceDavid Pursehouse2016-02-121-81/+81
| | | | | | | | | | | | | | | | | | | | | Also remove unnecessary nesting in test methods. Change-Id: Id59f8403c0a7b38ebb6b3a24814257cd59ea575d Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | PullCommandWithRebaseTest: Open RevWalk in try-with-resourceDavid Pursehouse2016-02-121-20/+21
| | | | | | | | | | | | | | | Change-Id: I16f4d219e8b103d30149b2a94d3484424f3de84b Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | PushCommandTest: Open Git instances in try-with-resourceDavid Pursehouse2016-02-121-187/+184
| | | | | | | | | | | | | | | Change-Id: I3a8e28a4097e868a34ee1b23256c7f28d570cd75 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | RacyGitTests: Open NameConflictTreeWalk in try-with-resourceDavid Pursehouse2016-02-121-32/+36
| | | | | | | | | | | | | | | Change-Id: Ic17b05fd7d056761b352168de97efb607a289276 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | RecursiveMergerTest: Open TreeWalk and BufferedReader in try-with-resourceDavid Pursehouse2016-02-121-15/+14
| | | | | | | | | | | | | | | Change-Id: I381d535eb4ed7535ba8541c5320f81ce11d5b173 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | ReflogConfigTest: refactor commit method to avoid variable hidingDavid Pursehouse2016-02-121-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The author and committer parameters were hiding class members of the same name. Since the passed in PersonIdent instances were being created from the class members anyway, remove the parameters and instead create the PersonIdent instances inline in the method. Change-Id: I66b057df388835d57f332fdcbadb8a9f4e1094a4 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | Update .mailmapDavid Pursehouse2016-02-121-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | - List names alphabetically by Firstname Surname - Replace tabs with spaces - Add missing name Change-Id: Ib320dad316e0f6e3e95363c4d6a64744032db857 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | RefDirectoryTest: Fix warning about member variable hidingDavid Pursehouse2016-02-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The parameter name 'totalWork' was hiding a class member variable of the same name. Change-Id: I646525e82900e23ffabfc756bcf5052ef873656a Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | ReflogResolveTest: Open Git instances in try-with-resourceDavid Pursehouse2016-02-121-88/+94
| | | | | | | | | | | | | | | Change-Id: I11ee38bfcf4951bf05a1632df08b1d074d38338b Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | ReflogTest: Open Git instances in try-with-resourceDavid Pursehouse2016-02-121-13/+16
| | | | | | | | | | | | | | | Change-Id: I950b6f16148cfe11de729b04904f88d6e4c28b9a Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | RepoCommandTest: Open Git instances in try-with-resourceDavid Pursehouse2016-02-121-26/+30
| | | | | | | | | | | | | | | Change-Id: I171e84eeb7862e74761ba6c961f14c86beaba9e7 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | Merge branch 'stable-4.1' into stable-4.2Matthias Sohn2016-02-102-0/+65
|\| | | | | | | | | | | | | | | | | | | | | | | * stable-4.1: Fix diff for added and removed submodule Change-Id: I37dd71ed19b06e9bbcffe37370081ab875c6d8d4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Fix diff for added and removed submoduleHugo Arès2016-02-042-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since If13f7b406, submodule difference are shown as a hunk. The issue was that added and removed submodule were considered as Edit.REPLACE instead of Edit.INSERT and Edit.DELETE in the DiffFormatter result. Change-Id: I4330c2aa3f10e29d7d6b0b2e5286e59293a06239 Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
* | | RepoProject: Fix warnings about variable hidingDavid Pursehouse2016-02-051-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Method parameter names were hiding class members of the same name. Change-Id: I182f2715894ac4259b09a371cb4e0eb24f52518a Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | RepoTest: Open Git in try-with-resourcesDavid Pursehouse2016-02-051-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | Allocate a new Git for each part of the test, rather than reassigning to the same variable. Change-Id: Ic83778bbff0b2f57d37b95aef70324859d42cd58 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
* | | RepositoryResolveTest: Open Git in try-with-resourceDavid Pursehouse2016-02-051-25/+27
| | | | | | | | | | | | | | | Change-Id: Ibb612f3d8fd0f9913291430474311d9da62f4e6f Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-15 09:58:45 +0000