{"header":{"message":"Add the ability to output the contents of a file.","description":null,"timestamp":"2023-04-05T22:17:09.972810017Z","authors":[{}]},"hash":"AYLFNM5CBTEA3LSXENULW4A66TJG55MNZUCARAMDVOYPBPXKHAOAC","authors":[{"login":"andybalholm","key":"BCEXYuKWaQ96btsk8UyBZWHLjn1Brhykv8tuZGPRjzFn"}],"deps":{"hashes":[["AYLFNM5CBTEA3LSXENULW4A66TJG55MNZUCARAMDVOYPBPXKHAOAC","Add the ability to output the contents of a file."],["AA",null],["GX2BR74VP5CYZQ3NNXD2UOMDDL7VQOO5EWE3FJXWCYL4RPZB7W6AC",""]],"deps":["GX2BR74VP5CYZQ3NNXD2UOMDDL7VQOO5EWE3FJXWCYL4RPZB7W6AC"],"known":[]},"hunks":[{"FileAdd":{"meta":{"basename":"output.go","metadata":0},"context":[{"change":2,"pos":1}],"contents":[{"Add":"package pijul"},{"Add":""},{"Add":"import ("},{"Add":"\t\"fmt\""},{"Add":"\t\"io\""},{"Add":")"},{"Add":""},{"Add":"// topologicalSort returns a slice of b and its children, sorted"},{"Add":"// topologically."},{"Add":"// It uses the algorithm from"},{"Add":"// https://en.wikipedia.org/wiki/Topological_sorting#Depth-first_search,"},{"Add":"// except that cycles are treated like the end of a branch of the"},{"Add":"// graph instead of causing the search to abort."},{"Add":"func topologicalSort(b *Block) []*Block {"},{"Add":"\tvar list []*Block"},{"Add":"\tvisited := make(map[*Block]bool)"},{"Add":""},{"Add":"\tvar visit func(*Block)"},{"Add":"\tvisit = func(n *Block) {"},{"Add":"\t\tif visited[n] {"},{"Add":"\t\t\treturn"},{"Add":"\t\t}"},{"Add":"\t\tvisited[n] = true"},{"Add":"\t\tfor _, e := range n.Edges {"},{"Add":"\t\t\tvisit(e.To)"},{"Add":"\t\t}"},{"Add":"\t\tlist = append(list, n)"},{"Add":"\t}"},{"Add":""},{"Add":"\tvisit(b)"},{"Add":""},{"Add":"\t// Reverse the list."},{"Add":"\tfor i, j := 0, len(list)-1; i < j; i, j = i+1, j-1 {"},{"Add":"\t\tlist[i], list[j] = list[j], list[i]"},{"Add":"\t}"},{"Add":""},{"Add":"\treturn list"},{"Add":"}"},{"Add":""},{"Add":"func OutputFile(dest io.Writer, inode *Block) error {"},{"Add":"\tblocks := topologicalSort(inode)"},{"Add":"\tindex := make(map[*Block]int, len(blocks))"},{"Add":"\tdeleted := make([]bool, len(blocks))"},{"Add":"\tfor i, b := range blocks {"},{"Add":"\t\tindex[b] = i"},{"Add":"\t\tif b.ReverseEdges[0].Flag&EdgeFlagsDeleted != 0 {"},{"Add":"\t\t\tdeleted[i] = true"},{"Add":"\t\t}"},{"Add":"\t}"},{"Add":""},{"Add":"\t// These maps tell us how many conflicts begin (etc.) directly before the"},{"Add":"\t// specified index of blocks."},{"Add":"\tconflictStart := make(map[int]int)"},{"Add":"\tconflictCenter := make(map[int]int)"},{"Add":"\tconflictEnd := make(map[int]int)"},{"Add":""},{"Add":"\tfor i, b := range blocks {"},{"Add":"\t\tif i == 0 {"},{"Add":"\t\t\tcontinue"},{"Add":"\t\t}"},{"Add":""},{"Add":"\t\thasEdge := false"},{"Add":"\t\tfor _, e := range blocks[i-1].Edges {"},{"Add":"\t\t\tif e.To == b {"},{"Add":"\t\t\t\thasEdge = true"},{"Add":"\t\t\t\tbreak"},{"Add":"\t\t\t}"},{"Add":"\t\t}"},{"Add":"\t\tif !hasEdge {"},{"Add":"\t\t\t// If this block is not a child of the previous block, the order between"},{"Add":"\t\t\t// them is undetermined, and therefore we have a conflict."},{"Add":""},{"Add":"\t\t\t// The conflict begins just after the closest parent of b."},{"Add":"\t\t\tclosestParent := -1"},{"Add":"\t\t\tfor _, e := range b.ReverseEdges {"},{"Add":"\t\t\t\tparent := index[e.From]"},{"Add":"\t\t\t\tif parent > closestParent {"},{"Add":"\t\t\t\t\tclosestParent = parent"},{"Add":"\t\t\t\t}"},{"Add":"\t\t\t}"},{"Add":""},{"Add":"\t\t\t// The conflict ends just before the closest child of the previous block."},{"Add":"\t\t\tclosestChild := len(blocks)"},{"Add":"\t\t\tfor _, e := range blocks[i-1].Edges {"},{"Add":"\t\t\t\tchild := index[e.To]"},{"Add":"\t\t\t\tif child < closestChild {"},{"Add":"\t\t\t\t\tclosestChild = child"},{"Add":"\t\t\t\t}"},{"Add":"\t\t\t}"},{"Add":""},{"Add":"\t\t\t// If either side of the conflict consists entirely of deleted vertices,"},{"Add":"\t\t\t// it's not really a conflict."},{"Add":"\t\t\taliveBefore := false"},{"Add":"\t\t\tfor j := closestParent + 1; j < i; j++ {"},{"Add":"\t\t\t\tif !deleted[j] {"},{"Add":"\t\t\t\t\taliveBefore = true"},{"Add":"\t\t\t\t\tbreak"},{"Add":"\t\t\t\t}"},{"Add":"\t\t\t}"},{"Add":"\t\t\taliveAfter := false"},{"Add":"\t\t\tfor j := i; j < closestChild; j++ {"},{"Add":"\t\t\t\tif !deleted[j] {"},{"Add":"\t\t\t\t\taliveAfter = true"},{"Add":"\t\t\t\t\tbreak"},{"Add":"\t\t\t\t}"},{"Add":"\t\t\t}"},{"Add":""},{"Add":"\t\t\tif aliveBefore && aliveAfter {"},{"Add":"\t\t\t\tconflictStart[closestParent+1]++"},{"Add":"\t\t\t\tconflictCenter[i]++"},{"Add":"\t\t\t\tconflictEnd[closestChild]++"},{"Add":"\t\t\t}"},{"Add":"\t\t}"},{"Add":"\t}"},{"Add":""},{"Add":"\tfor i, b := range blocks {"},{"Add":"\t\tfor j := 0; j < conflictEnd[i]; j++ {"},{"Add":"\t\t\tfmt.Fprintf(dest, \">>>>>>>\\n\")"},{"Add":"\t\t}"},{"Add":"\t\tfor j := 0; j < conflictCenter[i]; j++ {"},{"Add":"\t\t\tfmt.Fprintf(dest, \"======= %v\\n\", b.Change)"},{"Add":"\t\t}"},{"Add":"\t\tfor j := 0; j < conflictStart[i]; j++ {"},{"Add":"\t\t\tfmt.Fprintf(dest, \"<<<<<<< %v\\n\", b.Change)"},{"Add":"\t\t}"},{"Add":""},{"Add":"\t\tif deleted[i] {"},{"Add":"\t\t\tcontinue"},{"Add":"\t\t}"},{"Add":""},{"Add":"\t\t_, err := dest.Write(b.Content)"},{"Add":"\t\tif err != nil {"},{"Add":"\t\t\treturn err"},{"Add":"\t\t}"},{"Add":"\t}"},{"Add":""},{"Add":"\treturn nil"},{"Add":"}"}]}}],"owner":"andybalholm","repo":"pijul-go","token":"7yt+sOo4IZ6jU24fBuRVMO3HpUhp0a3icugISaHIGa8=","login":null}

…

Dependencies

Change contents