MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

svn: Fix parsing empty "svn:mergeinfo" value

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2018-07-12 22:00:47 +03:00
parent 9d9b1ae513
commit fb27a378b5
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/MergeRangeList.kt
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.idea.svn.mergeinfo
import org.jetbrains.idea.svn.api.ErrorCode.MERGE_INFO_PARSE_ERROR
@@ -8,7 +8,8 @@ data class MergeRangeList(val ranges: Set<MergeRange>) {
companion object {
@JvmStatic
@Throws(SvnBindException::class)
fun parseMergeInfo(value: String): Map<String, MergeRangeList> = value.lineSequence().map { parseLine(it) }.toMap()
fun parseMergeInfo(value: String): Map<String, MergeRangeList> = if (value.isEmpty()) emptyMap()
else value.lineSequence().map { parseLine(it) }.toMap()
@Throws(SvnBindException::class)
fun parseRange(value: String): MergeRange {

9
plugins/svn4idea/testSource/org/jetbrains/idea/svn/mergeinfo/MergeRangeTest.kt
View File

@@ -1,7 +1,8 @@
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.idea.svn.mergeinfo
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
class MergeRangeListTest {
@@ -27,6 +28,12 @@ class MergeRangeListTest {
assertEquals(expected, mergeInfo)
}
@Test
fun `parse empty merge info`() {
val mergeInfo = MergeRangeList.parseMergeInfo("")
assertTrue(mergeInfo.isEmpty())
}
private fun assertRange(value: String, start: Long, endInclusive: Long, isInheritable: Boolean = true) = assertEquals(
MergeRange(start, endInclusive, isInheritable), MergeRangeList.parseRange(value))
}