Fossil SCM
Added progress output to the code loading up the graph to traverse, nodes, and arcs.
Commit
41d41c7b57b0a08feff2ceff2a03178a321e1e85
Parent
74854a30b8b4cc4…
1 file changed
+8
| --- tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | ||
| @@ -173,19 +173,24 @@ | ||
| 173 | 173 | log write 3 cyclebreaker "Creating graph of changesets" |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | set dg [struct::graph dg] |
| 177 | 177 | |
| 178 | + set n 0 | |
| 179 | + set max [llength $changesets] | |
| 180 | + | |
| 178 | 181 | foreach cset $changesets { |
| 182 | + log progress 2 cyclebreaker $n $max | |
| 179 | 183 | set tr [$cset timerange] |
| 180 | 184 | $dg node insert $cset |
| 181 | 185 | $dg node set $cset timerange $tr |
| 182 | 186 | $dg node set $cset label "[$cset str]\\n[join [struct::list map $tr {::clock format}] "\\n"]" |
| 183 | 187 | $dg node set $cset __id__ [$cset id] |
| 184 | 188 | $dg node set $cset shape [expr {[$cset bysymbol] |
| 185 | 189 | ? "ellipse" |
| 186 | 190 | : "box"}] |
| 191 | + incr n | |
| 187 | 192 | } |
| 188 | 193 | |
| 189 | 194 | if {$log} { |
| 190 | 195 | log write 3 cyclebreaker "Has [nsp [llength $changesets] changeset]" |
| 191 | 196 | } |
| @@ -192,11 +197,13 @@ | ||
| 192 | 197 | |
| 193 | 198 | # 2. Find for all relevant changeset their revisions and their |
| 194 | 199 | # dependencies. Map the latter back to changesets and |
| 195 | 200 | # construct the corresponding arcs. |
| 196 | 201 | |
| 202 | + set n 0 | |
| 197 | 203 | foreach cset $changesets { |
| 204 | + log progress 2 cyclebreaker $n $max | |
| 198 | 205 | foreach succ [$cset successors] { |
| 199 | 206 | # Changesets may have dependencies outside of the |
| 200 | 207 | # chosen set. These are ignored |
| 201 | 208 | if {![$dg node exists $succ]} continue |
| 202 | 209 | $dg arc insert $cset $succ |
| @@ -203,10 +210,11 @@ | ||
| 203 | 210 | if {$succ eq $cset} { |
| 204 | 211 | $cset loopcheck |
| 205 | 212 | trouble fatal "[$cset str] depends on itself" |
| 206 | 213 | } |
| 207 | 214 | } |
| 215 | + incr n | |
| 208 | 216 | } |
| 209 | 217 | |
| 210 | 218 | if {$log} { |
| 211 | 219 | log write 3 cyclebreaker "Has [nsp [llength [$dg arcs]] dependency dependencies]" |
| 212 | 220 | } |
| 213 | 221 |
| --- tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | |
| +++ tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | |
| @@ -173,19 +173,24 @@ | |
| 173 | log write 3 cyclebreaker "Creating graph of changesets" |
| 174 | } |
| 175 | |
| 176 | set dg [struct::graph dg] |
| 177 | |
| 178 | foreach cset $changesets { |
| 179 | set tr [$cset timerange] |
| 180 | $dg node insert $cset |
| 181 | $dg node set $cset timerange $tr |
| 182 | $dg node set $cset label "[$cset str]\\n[join [struct::list map $tr {::clock format}] "\\n"]" |
| 183 | $dg node set $cset __id__ [$cset id] |
| 184 | $dg node set $cset shape [expr {[$cset bysymbol] |
| 185 | ? "ellipse" |
| 186 | : "box"}] |
| 187 | } |
| 188 | |
| 189 | if {$log} { |
| 190 | log write 3 cyclebreaker "Has [nsp [llength $changesets] changeset]" |
| 191 | } |
| @@ -192,11 +197,13 @@ | |
| 192 | |
| 193 | # 2. Find for all relevant changeset their revisions and their |
| 194 | # dependencies. Map the latter back to changesets and |
| 195 | # construct the corresponding arcs. |
| 196 | |
| 197 | foreach cset $changesets { |
| 198 | foreach succ [$cset successors] { |
| 199 | # Changesets may have dependencies outside of the |
| 200 | # chosen set. These are ignored |
| 201 | if {![$dg node exists $succ]} continue |
| 202 | $dg arc insert $cset $succ |
| @@ -203,10 +210,11 @@ | |
| 203 | if {$succ eq $cset} { |
| 204 | $cset loopcheck |
| 205 | trouble fatal "[$cset str] depends on itself" |
| 206 | } |
| 207 | } |
| 208 | } |
| 209 | |
| 210 | if {$log} { |
| 211 | log write 3 cyclebreaker "Has [nsp [llength [$dg arcs]] dependency dependencies]" |
| 212 | } |
| 213 |
| --- tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | |
| +++ tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | |
| @@ -173,19 +173,24 @@ | |
| 173 | log write 3 cyclebreaker "Creating graph of changesets" |
| 174 | } |
| 175 | |
| 176 | set dg [struct::graph dg] |
| 177 | |
| 178 | set n 0 |
| 179 | set max [llength $changesets] |
| 180 | |
| 181 | foreach cset $changesets { |
| 182 | log progress 2 cyclebreaker $n $max |
| 183 | set tr [$cset timerange] |
| 184 | $dg node insert $cset |
| 185 | $dg node set $cset timerange $tr |
| 186 | $dg node set $cset label "[$cset str]\\n[join [struct::list map $tr {::clock format}] "\\n"]" |
| 187 | $dg node set $cset __id__ [$cset id] |
| 188 | $dg node set $cset shape [expr {[$cset bysymbol] |
| 189 | ? "ellipse" |
| 190 | : "box"}] |
| 191 | incr n |
| 192 | } |
| 193 | |
| 194 | if {$log} { |
| 195 | log write 3 cyclebreaker "Has [nsp [llength $changesets] changeset]" |
| 196 | } |
| @@ -192,11 +197,13 @@ | |
| 197 | |
| 198 | # 2. Find for all relevant changeset their revisions and their |
| 199 | # dependencies. Map the latter back to changesets and |
| 200 | # construct the corresponding arcs. |
| 201 | |
| 202 | set n 0 |
| 203 | foreach cset $changesets { |
| 204 | log progress 2 cyclebreaker $n $max |
| 205 | foreach succ [$cset successors] { |
| 206 | # Changesets may have dependencies outside of the |
| 207 | # chosen set. These are ignored |
| 208 | if {![$dg node exists $succ]} continue |
| 209 | $dg arc insert $cset $succ |
| @@ -203,10 +210,11 @@ | |
| 210 | if {$succ eq $cset} { |
| 211 | $cset loopcheck |
| 212 | trouble fatal "[$cset str] depends on itself" |
| 213 | } |
| 214 | } |
| 215 | incr n |
| 216 | } |
| 217 | |
| 218 | if {$log} { |
| 219 | log write 3 cyclebreaker "Has [nsp [llength [$dg arcs]] dependency dependencies]" |
| 220 | } |
| 221 |