1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429
|
#!/bin/sh
# the next line restarts using tclsh \
exec tclsh "$0" -- ${1+"$@"}
proc cleanup_old {root} {
if {[ file isdirectory $root ]} {
puts "Deleting $root"
file delete -force $root
}
set oldirs [glob -nocomplain -- svnnc*]
foreach od $oldirs {
puts "Deleting $od"
file delete -force $od
}
puts "==============================="
}
proc repository {Root topdir} {
global taghead
puts "==============================="
puts "MAKING REPOSITORY $Root"
# Create the repository
file mkdir $Root
set exec_cmd "svnadmin create $Root"
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
if {$ret} {
puts $out
puts "COULD NOT CREATE REPOSITORY $Root"
exit 1
}
puts "CREATED $Root"
file mkdir [file join $topdir $taghead(trunk)]
file mkdir [file join $topdir $taghead(branch)]
file mkdir [file join $topdir $taghead(tag)]
puts "==============================="
puts "IMPORTING FILETREE"
set exec_cmd "svn import $topdir file:///$Root -m \"Imported\""
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
puts "IMPORT FINISHED"
}
proc checkout_branch {Root tag} {
global taghead
puts "==============================="
puts "CHECKING OUT $tag"
# Check out
if {$tag eq $taghead(trunk)} {
set exec_cmd "svn co file:///$Root/$taghead(trunk) svnnc_$tag"
} else {
set exec_cmd "svn co file:///$Root/$taghead(branch)/$tag svnnc_$tag"
}
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
puts "CHECKOUT FINISHED"
}
proc newbranch {Root oldtag newtag} {
global taghead
if {$oldtag eq $taghead(trunk)} {
set exec_cmd "svn copy file:///$Root/$oldtag file:///$Root/$taghead(branch)/$newtag -m \"Dogs $newtag\""
} else {
set exec_cmd "svn copy file:///$Root/$taghead(branch)/$oldtag file:///$Root/$taghead(branch)/$newtag -m \"Dogs $newtag\""
}
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
puts "CHECKING OUT BRANCH"
set exec_cmd "svn co file:///$Root/$taghead(branch)/$newtag svnnc_$newtag"
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
}
proc tag {Root tag} {
global taghead
# Need to update . or the tag may be in the wrong place
set exec_cmd "svn update \".\""
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
puts "Tag: $tag"
set exec_cmd "svn copy \".\" file:///$Root/$taghead(tag)/$tag -m \"Tag $tag\""
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
}
proc merge {fromtag totag} {
global taghead
global WD
cd svnnc_$totag
set exec_cmd "svn update"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
# This puts mergeinfo only into .
# --- Recording mergeinfo for merge between repository URLs into '.'
set exec_cmd "svn merge --reintegrate ^/$taghead(branch)/$fromtag"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
commit "Merge branch A to trunk"
cd $WD
}
proc writefile {filename string} {
puts " append \"$string\" to $filename"
set fp [open "$filename" a]
puts $fp $string
close $fp
}
proc addfile {filename branch} {
puts "Add $filename on $branch"
set exec_cmd "svn add $filename"
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
}
proc delfile {filename branch} {
puts "Delete $filename on $branch"
file delete $filename
set exec_cmd "svn delete $filename"
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
}
proc commit {comment} {
set exec_cmd "svn commit -m \"$comment\""
# This is so the timestamp is different from the last commit
after 1000
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
}
proc mkfiles {topdir} {
global WD
global taghead
puts "MAKING FILETREE"
# Make some files to put in the repository
set trunkhead [file join $topdir $taghead(trunk)]
file mkdir $trunkhead
cd $trunkhead
# Make some text files
foreach n {1 2 3} {
writefile "File$n.txt" "Initial"
}
writefile "FTags.txt" "Initial"
foreach D {Dir1 "Dir 2"} {
puts $D
file mkdir $D
foreach n {1 2 " 3"} {
set subf [file join $D "F$n.txt"]
writefile $subf "Initial"
}
}
cd $WD
}
proc modfiles {string} {
global tcl_platform
set tmpfile "list.tmp"
file delete -force $tmpfile
if {$tcl_platform(platform) eq "windows"} {
puts "Must be a PC"
set ret [catch {eval "exec [auto_execok dir] /b F*.txt /s > $tmpfile"} out]
} else {
set ret [catch {eval "exec find . -name F*.txt -o -name .svn -prune -a -type f > $tmpfile"} out]
}
if {$ret} {
puts "Find failed"
puts $out
exit 1
}
set fl [open $tmpfile r]
while { [gets $fl item] >= 0} {
writefile $item "$string"
}
close $fl
file delete -force $tmpfile
}
proc getrev {filename} {
# Find out current revision
set exec_cmd "svn log -q $filename"
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
foreach logline [split $out "\n"] {
if {[string match "r*" $logline]} {
set latest [lindex $logline 0]
break
}
}
return $latest
}
proc conflict {filename} {
# Create a conflict
set latest [getrev $filename]
# Save a copy
file copy $filename Ftmp.txt
# Make a change
writefile $filename "Conflict A"
set exec_cmd "svn commit -m \"change1\" $filename"
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
# Check out latest revision
set exec_cmd "svn update -r $latest $filename"
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
# Make a different change (we hope)
file delete -force -- $filename
file rename Ftmp.txt $filename
writefile $filename "Conflict B"
# Check out head, which now conflicts with our change
set exec_cmd "svn update --non-interactive -r HEAD $filename"
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
}
##############################################
set branching_desired 1
set leave_a_mess 1
for {set i 1} {$i < [llength $argv]} {incr i} {
set arg [lindex $argv $i]
switch -regexp $arg {
{^--*nobranch} {
set branching_desired 0
}
{^--*nomess} {
set leave_a_mess 0
}
}
}
if [file isdirectory .svn] {
puts "Please don't do that here. There's already a .svn directory."
exit 1
}
set WD [pwd]
set SVNROOT [file join $WD "SVN_NONCONFORM"]
set taghead(trunk) "elephants"
set taghead(branch) "dogs"
set taghead(tag) "ducklings"
cleanup_old $SVNROOT
mkfiles "svnnc"
repository $SVNROOT "svnnc"
checkout_branch "$SVNROOT" "$taghead(trunk)"
puts "==============================="
puts "First revision on $taghead(trunk)"
cd svnnc_$taghead(trunk)
set exec_cmd "svn propset -R svn:ignore .DS_Store ."
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
if {$ret} {
puts $out
}
modfiles "Main 1"
writefile Ftrunk.txt "Main 1"
addfile Ftrunk.txt $taghead(trunk)
commit "First revision on $taghead(trunk)"
tag $SVNROOT "ducklingA"
tag $SVNROOT "ducklingC"
cd $WD
if {$branching_desired} {
puts "==============================="
puts "MAKING BRANCH A"
newbranch $SVNROOT $taghead(trunk) dogsA
cd $WD/svnnc_dogsA
writefile FdogsA.txt "DogsA 1"
addfile FdogsA.txt dogsA
commit "Add file FdogsA.txt on branch A"
cd $WD
puts "==============================="
puts "First revision on Branch A"
cd $WD/svnnc_dogsA
modfiles "DogsA 1"
commit "First revision on branch A"
cd $WD
puts "==============================="
puts "Second revision on Branch A"
cd $WD/svnnc_dogsA
modfiles "DogsA 2"
commit "Second revision on branch A"
tag $SVNROOT "ducklingAA"
cd $WD
# Branch C
puts "==============================="
puts "MAKING BRANCH C FROM SAME ROOT"
newbranch $SVNROOT $taghead(trunk) dogsC
cd $WD/svnnc_dogsC
modfiles "DogsC 1"
writefile FdogsC.txt "DogsC 1"
addfile FdogsC.txt dogsC
commit "Add file FC on Branch C"
cd $WD
puts "==============================="
puts "Merging Branch A to trunk"
merge dogsA $taghead(trunk)
cd $WD
}
# Make more modifications on trunk
puts "==============================="
puts "Second revision on $taghead(trunk)"
cd $WD/svnnc_$taghead(trunk)
modfiles "Main 2"
commit "Second revision on $taghead(trunk)"
foreach t {one ten one_hundred one_thousand ten_thousand one_hundred_thousand} {
set exec_cmd "svn copy --parents -m\"multitags\" FTags.txt file://$SVNROOT/$taghead(tag)/$t/FTags.txt"
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
if {$ret} {
exit 1
}
}
cd $WD
puts "==============================="
puts "Third revision on $taghead(trunk)"
cd $WD/svnnc_$taghead(trunk)
modfiles "Main 3"
commit "Third revision on $taghead(trunk)"
tag $SVNROOT "ducklingB"
cd $WD
if {$branching_desired} {
# Branch off of the branch
puts "==============================="
puts "MAKING BRANCH AA"
newbranch $SVNROOT dogsA dogsAA
cd $WD/svnnc_dogsAA
modfiles "DogsAA 1"
writefile FdogsAA.txt "DogsAA 1"
addfile FdogsAA.txt dogsAA
delfile Ftrunk.txt dogsAA
commit "Changes on Dogs AA"
cd $WD
# Make another revision on branchA after
# branchAA has branched off
puts "==============================="
puts "Third revision on Branch A"
cd $WD/svnnc_dogsA
modfiles "DogsA 3"
commit "Third revision on Dogs A"
cd $WD
# Branch B
puts "==============================="
puts "MAKING BRANCH B"
newbranch $SVNROOT $taghead(trunk) dogsB
cd $WD/svnnc_dogsB
# Empty branch. Don't check out or update.
set exec_cmd "svn mkdir -m\"empty_branch\" file://$SVNROOT/$taghead(branch)/branchD"
puts "$exec_cmd"
set ret [catch {eval "exec $exec_cmd"} out]
puts $out
if {$ret} {
exit 1
}
modfiles "DogsB 1"
writefile FdogsB.txt "DogsB 1"
addfile FdogsB.txt dogsB
commit "Add file FB on Dogs B"
cd $WD
}
if {$leave_a_mess} {
# Leave the trunk with uncommitted changes
puts "==============================="
puts "Making Uncommitted changes on trunk"
cd $WD/svnnc_$taghead(trunk)
# Local only
writefile FileLocal.txt "Pending"
# Newly added
writefile FileAdd.txt "Pending"
addfile FileAdd.txt trunk
# Missing
file delete -- File3.txt trunk
# Modify
writefile File2.txt "Pending"
writefile "Dir1/F 3.txt" "Pending"
writefile "Dir1/F2.txt" "Pending"
writefile "Dir 2/F1.txt" "Pending"
# Conflict
conflict Ftrunk.txt
cd $WD
}
# Remove the source
file delete -force -- svnnc
|