Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed uncommited changes parent node lane position

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2021-10-30 19:38:11 +02:00
parent ba4c9596f8
commit b63614d68d
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/kotlin/app/git/graph/GraphCommitList.kt
View File

@ -61,9 +61,11 @@ class GraphCommitList : RevCommitList<GraphNode>() {
} }
override fun enter(index: Int, currCommit: GraphNode) { override fun enter(index: Int, currCommit: GraphNode) {
if(currCommit.id == parentId) { var isUncommitedChangesNodeParent = false
if (currCommit.id == parentId) {
graphCommit.graphParent = currCommit graphCommit.graphParent = currCommit
currCommit.addChild(graphCommit, addFirst = true) currCommit.addChild(graphCommit, addFirst = true)
isUncommitedChangesNodeParent = true
} }
setupChildren(currCommit) setupChildren(currCommit)
@ -80,7 +82,7 @@ class GraphCommitList : RevCommitList<GraphNode>() {
var len = laneLength[currCommit.lane] var len = laneLength[currCommit.lane]
len = if (len != null) Integer.valueOf(len.toInt() + 1) else Integer.valueOf(0) len = if (len != null) Integer.valueOf(len.toInt() + 1) else Integer.valueOf(0)
if(currCommit.lane.position != INVALID_LANE_POSITION) if (currCommit.lane.position != INVALID_LANE_POSITION)
laneLength[currCommit.lane] = len laneLength[currCommit.lane] = len
} else { } else {
// More than one child, or our child is a merge. // More than one child, or our child is a merge.
@ -100,20 +102,31 @@ class GraphCommitList : RevCommitList<GraphNode>() {
var reservedLane: GraphLane? = null var reservedLane: GraphLane? = null
var childOnReservedLane: GraphNode? = null var childOnReservedLane: GraphNode? = null
var lengthOfReservedLane = -1 var lengthOfReservedLane = -1
for (i in 0 until nChildren) {
val c: GraphNode = currCommit.children[i]
if (c.getGraphParent(0) === currCommit) {
if (c.lane.position < 0)
println("c.lane.position is invalid (${c.lane.position})")
val length = laneLength[c.lane]
// we may be the first parent for multiple lines of if (isUncommitedChangesNodeParent) {
// development, try to continue the longest one val length = laneLength[graphCommit.lane]
if (length != null && length > lengthOfReservedLane) { if (length != null) {
reservedLane = c.lane reservedLane = graphCommit.lane
childOnReservedLane = c childOnReservedLane = graphCommit
lengthOfReservedLane = length lengthOfReservedLane = length
}
} else {
for (i in 0 until nChildren) {
val c: GraphNode = currCommit.children[i]
if (c.getGraphParent(0) === currCommit) {
if (c.lane.position < 0)
println("c.lane.position is invalid (${c.lane.position})")
val length = laneLength[c.lane]
// we may be the first parent for multiple lines of
// development, try to continue the longest one
if (length != null && length > lengthOfReservedLane) {
reservedLane = c.lane
childOnReservedLane = c
lengthOfReservedLane = length
}
} }
} }
} }