Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Unified revision parsing to system specific ParseRevs routines. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
b897829480aee8a167c2f93bfadbf9b2 |
User & Date: | peter 2007-09-25 18:51:15.000 |
Context
2007-09-25
| ||
19:55 | Handle simple GIT cases. check-in: 1e4def9163 user: peter tags: trunk | |
18:51 | Unified revision parsing to system specific ParseRevs routines. check-in: b897829480 user: peter tags: trunk | |
18:47 | Added -printpdf command line option. check-in: f12cf43385 user: peter tags: trunk | |
Changes
Changes to src/rev.tcl.
︙ | ︙ | |||
148 149 150 151 152 153 154 155 156 | } if {$old != ""} { cd $old } return $rev } # Figure out CVS revision from arguments | > > > > > > > > > > | > > | | | | | | | | > | | | > > > > > > > > | | | | | | | | | < < < < < < < < < < < < < < < < | > > > > > > > > > > > > > > > > | | | | | | | | | | | | | > | | > > > > > > > > > > > > > > > | 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 | } if {$old != ""} { cd $old } return $rev } # Figure out RCS revision from arguments proc eskil::rev::RCS::ParseRevs {filename revs} { return $revs } # Figure out GIT revision from arguments proc eskil::rev::GIT::ParseRevs {filename revs} { return [list HEAD] } # Figure out CVS revision from arguments proc eskil::rev::CVS::ParseRevs {filename revs} { set result {} foreach rev $revs { # An integer rev is a relative rev if {[string is integer -strict $rev]} { set curr [eskil::rev::CVS::GetCurrent $filename] regexp {^(.*\.)(\d+)$} $curr -> head tail set tail [expr {$tail + $rev}] if {$tail < 1} {set tail 1} set rev $head$tail } lappend result $rev } return $result } # Figure out ClearCase revision from arguments proc eskil::rev::CT::ParseRevs {filename revs} { set tmp [eskil::rev::CT::current $filename] foreach {stream latest} $tmp break if {[llength $revs] == 0} { return [list [file join $stream $latest]] } set result {} foreach rev $revs { # A negative version number is offset from latest. set offset 0 set tail [file tail $rev] if {[string is integer -strict $tail] && $tail < 0} { set offset $tail set rev [file dirname $rev] } # If the argument is of the form "name/rev", look for a fitting one if {![string is integer $rev] && [regexp {^[^/.]+(/\d+)?$} $rev]} { if {[catch {exec cleartool lshistory -short $filename} allrevs]} {# tk_messageBox -icon error -title "Cleartool error" \ -message $allrevs return } set allrevs [split $allrevs \n] set i [lsearch -glob $allrevs "*$rev" ] if {$i >= 0} { set rev [lindex [split [lindex $allrevs $i] "@"] end] } } set rev [file normalize [file join $stream $rev]] # If we don't have a version number, try to find the latest if {![string is integer [file tail $rev]]} { if {![info exists allrevs]} { if {[catch {exec cleartool lshistory -short $filename} allrevs]} {# tk_messageBox -icon error -title "Cleartool error" \ -message $allrevs return } set allrevs [split $allrevs \n] } set apa [lsearch -regexp -all -inline $allrevs "$rev/\\d+\$"] set apa [lindex [lsort -dictionary $apa] end] if {$apa ne ""} { set rev [lindex [split $apa "@"] end] } } set tail [file tail $rev] if {[string is integer -strict $tail] && $offset < 0} { set path [file dirname $rev] set tail [expr {$tail + $offset}] if {$tail < 0} {set tail 0} set rev [file join $path $tail] } lappend result $rev } return $result } # Check in CVS controlled file proc eskil::rev::CVS::commitFile {top filename} { set logmsg [LogDialog $top $filename] if {$logmsg ne ""} { catch {exec cvs -q commit -m $logmsg $filename} } } proc eskil::rev::CT::current {filename} { # Figure out stream and current version if {[catch {exec cleartool ls $filename} info]} { tk_messageBox -icon error -title "Cleartool error" -message $info return } set currV {} if {![regexp {@@(\S+)\s+from (\S+)\s+Rule} $info -> dummy currV]} { regexp {@@(\S+)} $info -> currV } set stream [file dirname $currV] set latest [file tail $currV] return [list $stream $latest] } ############################################################################## # Exported procedures ############################################################################## # Figure out what revision control system a file is under # Returns "CVS", "RCS", "CT", "GIT" if detected, or "" if none. |
︙ | ︙ | |||
260 261 262 263 264 265 266 | proc prepareRev {top} { global Pref $::widgets($top,commit) configure -state disabled set type $::diff($top,modetype) | < < < < < < < < < < < < < < < | | | < < | < < < < < < < < < < < < < < < < | 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 | proc prepareRev {top} { global Pref $::widgets($top,commit) configure -state disabled set type $::diff($top,modetype) set revs {} # Search for revision options if {$::diff($top,doptrev1) != ""} { lappend revs $::diff($top,doptrev1) } if {$::diff($top,doptrev2) != ""} { lappend revs $::diff($top,doptrev2) } set revs [eskil::rev::${type}::ParseRevs $::diff($top,RevFile) $revs] set revlabels {} foreach rev $revs { lappend revlabels [GetLastTwoPath $rev] } if {[llength $revs] < 2} { # Compare local file with specified version. disallowEdit $top 1 if {[llength $revs] == 0} { set r "" set tag "($type)" } else { set r [lindex $revs 0] set tag "($type [lindex $revlabels 0])" } set ::diff($top,leftFile) [tmpFile] set ::diff($top,leftLabel) "$::diff($top,RevFile) $tag" |
︙ | ︙ |