2022.08.08:

* fixed: bash/github/init-yq-workflow.sh: `yq_restore_edited_uniform_diff` inaccurate blank lines position

Author: andry81

bash/github/init-yq-workflow.sh

@@ -753,7 +753,9 @@ function yq_restore_edited_uniform_diff() # NOTE: Experimental
   local DiffChunkAddLineOffset
   local DiffChunkNumAddLines
   local DiffChunkOffsetShift
+
   local AccumDiffChunkOffsetShift
+
   local DiffRemoveChunkLine
   local DiffRemoveChunkLineKeyText
   local DiffRemoveChunkLineFiltered
@@ -762,13 +764,16 @@ function yq_restore_edited_uniform_diff() # NOTE: Experimental
   local DiffRemoveChunkLines
   local DiffRemoveChunkLinesLen
   local DiffRemoveChunkLinesIndex
+
   local DiffAddChunkLine
   local DiffAddChunkLineKeyText
   local DiffAddChunkLineFiltered
   local DiffAddChunkLineFilteredLen
   local DiffAddChunkLines
   local DiffAddChunkLinesLen
   local DiffAddChunkLinesIndex
+  local DiffAddChunkLinesToRemove
+
   local MergedDiffChunkLineLen
   local MergeDiffAddChunkLineNextIndex
   local IsDiffAddChunkLineProcessed
@@ -795,6 +800,8 @@ function yq_restore_edited_uniform_diff() # NOTE: Experimental
     DiffRemoveChunkLinesLen="${#DiffRemoveChunkLines[@]}"
     DiffAddChunkLinesLen="${#DiffAddChunkLines[@]}"
 
+    DiffAddChunkLinesToRemove=()
+
     MergeDiffAddChunkLineNextIndex=0
 
     if (( DiffRemoveChunkLinesLen )); then
@@ -846,6 +853,9 @@ function yq_restore_edited_uniform_diff() # NOTE: Experimental
 
               (( MergeDiffAddChunkLineNextIndex = DiffAddChunkLinesIndex + 1 ))
 
+              # unregister to remove
+              unset DiffAddChunkLinesToRemove[DiffAddChunkLinesIndex]
+
               IsDiffAddChunkLineProcessed=1
 
               break
@@ -868,22 +878,22 @@ function yq_restore_edited_uniform_diff() # NOTE: Experimental
 
                 (( MergeDiffAddChunkLineNextIndex = DiffAddChunkLinesIndex + 1 ))
 
+                # unregister to remove
+                unset DiffAddChunkLinesToRemove[DiffAddChunkLinesIndex]
+
                 IsDiffAddChunkLineProcessed=1
 
                 break
               elif [[ -n "$DiffAddChunkLineKeyText" ]]; then
-                # yaml key is found, remove the line
-                unset DiffAddChunkLines[DiffAddChunkLinesIndex]
-
-                (( DiffChunkNumAddLines-- ))
-                (( DiffChunkOffsetShift-- ))
+                # yaml key is found, register to remove the line if would not processed at all
+                (( DiffAddChunkLinesToRemove[DiffAddChunkLinesIndex] = 1 ))
               fi
             fi
           fi
         done
 
         if (( ! IsDiffAddChunkLineProcessed )); then
-          # shift
+          # shift with not set values
           (( DiffAddChunkLinesLen++ ))
 
           for (( DiffAddChunkLinesIndex = DiffAddChunkLinesLen; MergeDiffAddChunkLineNextIndex < DiffAddChunkLinesIndex; DiffAddChunkLinesIndex-- )); do
@@ -892,6 +902,12 @@ function yq_restore_edited_uniform_diff() # NOTE: Experimental
             else
               unset DiffAddChunkLines[DiffAddChunkLinesIndex]
             fi
+
+            if [[ -n "${DiffAddChunkLinesToRemove[DiffAddChunkLinesIndex - 1]+x}" ]]; then
+              DiffAddChunkLinesToRemove[DiffAddChunkLinesIndex]="${DiffAddChunkLinesToRemove[DiffAddChunkLinesIndex - 1]}"
+            else
+              unset DiffAddChunkLinesToRemove[DiffAddChunkLinesIndex]
+            fi
           done
 
           DiffAddChunkLines[MergeDiffAddChunkLineNextIndex++]="${DiffRemoveChunkLines[DiffRemoveChunkLinesIndex]}" # insert
@@ -928,6 +944,16 @@ function yq_restore_edited_uniform_diff() # NOTE: Experimental
       fi
     fi
 
+    # remove chunk addition lines registered to remove
+    for (( DiffAddChunkLinesIndex=0; DiffAddChunkLinesIndex < DiffAddChunkLinesLen; DiffAddChunkLinesIndex++ )); do
+      if (( DiffAddChunkLinesToRemove[DiffAddChunkLinesIndex] )); then
+        unset DiffAddChunkLines[DiffAddChunkLinesIndex]
+
+        (( DiffChunkNumAddLines-- ))
+        (( DiffChunkOffsetShift-- ))
+      fi
+    done
+
     (( DiffChunkAddLineOffset += AccumDiffChunkOffsetShift ))
 
     diff_make_uniform_chunk_header "$DiffChunkRemoveLineOffset" "$DiffChunkNumRemoveLines" "$DiffChunkAddLineOffset" "$DiffChunkNumAddLines" "$DiffChunkOffsetShift"

changelog.txt

@@ -1,3 +1,6 @@
+2022.08.08:
+* fixed: bash/github/init-yq-workflow.sh: `yq_restore_edited_uniform_diff` inaccurate blank lines position
+
 2022.08.07:
 * fixed: bash/github/init-*-workflow.sh: minor fixup
 * new: bash/github: added `init-diff-workflow.sh` to support `diff` command workflow

userlog.md

@@ -2,6 +2,14 @@
 
 > :warning: to find all changes use [changelog.txt](https://github.com/andry81-devops/gh-workflow/blob/master/changelog.txt) file in a directory
 
+## 2022.08.08:
+* fixed: bash/github/init-yq-workflow.sh: `yq_restore_edited_uniform_diff` inaccurate blank lines position
+
+## 2022.08.07:
+* new: bash/github: added `init-diff-workflow.sh` to support `diff` command workflow
+* new: bash/github/init-yq-workflow.sh: `yq_restore_edited_uniform_diff` function to restore yaml comments and blank lines
+* changed: bash/cache/accum-content.sh: use `yq_restore_edited_uniform_diff` function by default
+
 ## 2022.05.31:
 * new: bash/github/accum-stats.sh: added `STATS_REMOVED_DATES` return variable, print last removed dates additionally to the last changed dates
 * new: bash/github/accum-stats.sh: `ENABLE_COMMIT_MESSAGE_DATE_TIME_WITH_LAST_CHANGED_DATE_OFFSET` environment variable to insert datetime suffix as offset to the last changed date in format `-DDT` to note the closest changed date