Eskil

Diff
Login

Differences From Artifact [77f7bd18a9]:

To Artifact [370723150b]:


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
    set dir [file dirname $filename]
    if {$dir != "."} {
        set old [pwd]
        cd $dir
        set filename [file tail $filename]
    }

    set cmd [list exec cvs status [file nativename $filename]]
    if {[catch {eval $cmd} res]} {
        # What to do here?
        set rev "1.1"
    } else {
        if {![regexp {Working revision:\s+(\d\S*)} $res -> rev]} {
            set rev "1.1"
        }
    }

    if {$old != ""} {
        cd $old
    }
    return $rev
}

# Figure out CVS revision from arguments
proc ParseCvsRevs {filename rev} {
    # An integer rev is a relative rev
    if {[string is integer -strict $rev]} {
        puts "Hej $rev"
        set curr [GetCurrentRev $filename]
        puts "Hopp $curr"
        regexp {^(.*\.)(\d+)$} $curr -> head tail
        set tail [expr {$tail + $rev}]
        if {$tail < 1} {set tail 1}
        set rev $head$tail
    }
    
    return $rev







|



















<

<







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
    set dir [file dirname $filename]
    if {$dir != "."} {
        set old [pwd]
        cd $dir
        set filename [file tail $filename]
    }

    set cmd [list exec cvs -n status [file nativename $filename]]
    if {[catch {eval $cmd} res]} {
        # What to do here?
        set rev "1.1"
    } else {
        if {![regexp {Working revision:\s+(\d\S*)} $res -> rev]} {
            set rev "1.1"
        }
    }

    if {$old != ""} {
        cd $old
    }
    return $rev
}

# Figure out CVS revision from arguments
proc ParseCvsRevs {filename rev} {
    # An integer rev is a relative rev
    if {[string is integer -strict $rev]} {

        set curr [GetCurrentRev $filename]

        regexp {^(.*\.)(\d+)$} $curr -> head tail
        set tail [expr {$tail + $rev}]
        if {$tail < 1} {set tail 1}
        set rev $head$tail
    }
    
    return $rev