just write out script to set commitids, don't actually do it

modifying a local repo is not as important right now

lib/outputter.rb

···
   end
 
   def dup_script(script, tree)
+    puts "writing update script to #{script.path}"
+
     script.puts "#!/bin/sh -x"
     script.puts "if [ \"$TMPCVSDIR\" = \"\" ]; then echo 'set $TMPCVSDIR'; " +
       "exit 1; fi"
···
     csid = nil
     @scanner.db.execute("SELECT
     files.file, changesets.commitid, changesets.author, changesets.date,
-    revisions.version
+    revisions.version, changesets.branch
     FROM revisions
     LEFT OUTER JOIN files ON files.id = file_id
     LEFT OUTER JOIN changesets ON revisions.changeset_id = changesets.id
-    WHERE revisions.commitid IS NULL
-    ORDER BY changesets.date ASC, files.file ASC") do |rev|
+    ORDER BY changesets.csorder ASC, files.file ASC") do |rev|
       if csid == nil || rev["commitid"] != csid
-        script.puts "# commit #{rev["commitid"]} at #{Time.at(rev["date"])} " +
-          "by " + rev["author"]
+        script.puts "# #{Time.at(rev["date"])} by " + rev["author"] +
+          (rev["branch"].to_s == "" ? "" : " (branch #{rev["branch"]})")
         csid = rev["commitid"]
       end
 

openbsd-commitid.rb

···
   # in the commitids-{tree} file
   sc.recalculate_commitids(CVSTMP, CVSROOT, tree, GENESIS)
 
-  # and finally, update every revision of every file and write its calculated
-  # commitid, possibly replacing the random one already there
-  sc.repo_surgery(CVSTMP, CVSROOT, tree)
+  # output a shell script to add/change all of the commitids in a clean repo
+  sc.outputter.dup_script(f = File.open("out/add_commitids_to_#{tree}.sh",
+    "w+"), tree)
+  f.close
 end