1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
|
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
|
+
+
+
+
+
-
+
+
|
set ::eskil($top,leftFile) $::eskil($top,RevFile)
}
proc revCommit {top} {
if {[$::widgets($top,commit) cget -state] eq "disabled"} return
set type $::eskil($top,modetype)
if {$::eskil($top,mode) eq "patch"} {
if {[llength $::eskil($top,patchFilelist)] != 0} {
# Use the list extracted from patch
set files $::eskil($top,patchFilelist)
} else {
# Use the list given by user
set files $::eskil($top,reviewFiles)
set files $::eskil($top,reviewFiles)
}
} else {
set files [list $::eskil($top,RevFile)]
}
eskil::rev::${type}::commitFile $top {*}$files
}
proc revRevert {top} {
|
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
|
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
|
+
+
+
+
+
|
return $last
} else {
return [file join $penultimate $last]
}
}
# Dialog for commit, getting log message
# target: String shown in dialog
# system: Rev System
# precmd: Command part before message
# postcmd: Command part after message. Assumed to be files.
# useSts: Use status from exec rather than message to recognise error.
proc CommitDialog {top target system precmd postcmd {useSts 0}} {
set w $top.logmsg
destroy $w
toplevel $w -padx 3 -pady 3
wm title $w "Commit log message for $target"
set ::eskil($top,logdialogok) 0
|
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
|
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
bind $w <Alt-c> [list destroy $w]\;break
bind $w <Key-Escape> [list destroy $w]\;break
grid $w.t - -sticky news -padx 3 -pady 3
grid $w.ok $w.ca -padx 3 -pady 3
grid columnconfigure $w $w.t -weight 1 -uniform a
grid rowconfigure $w $w.t -weight 1
if {[llength $postcmd] > 1} {
# TODO: Scrolled frame
ttk::frame $w.f -padding 1
set t 0
foreach fileName $postcmd {
set ::eskil($top,commit,fileselect$t) 1
ttk::checkbutton $w.f.cb$t -text $fileName \
-variable ::eskil($top,commit,fileselect$t)
grid $w.f.cb$t -sticky "w" -padx 1 -pady 1
incr t
}
grid $w.f -sticky news -padx 3 -pady 3
}
tkwait visibility $w
focus -force $w.t
tkwait window $w.dummy
if {!$::eskil($top,logdialogok)} {
return
}
set res [string trim $::eskil(logdialog)]
set ::eskil(logdialog) $res
set todo $postcmd
if {[llength $postcmd] > 1} {
set todo {}
set t 0
foreach fileName $postcmd {
if {$::eskil($top,commit,fileselect$t)} {
lappend todo $fileName
}
incr t
}
# None left means skip.
if {[llength $todo] == 0} {
return
}
}
# Splash screen for visual feedback
set now [clock clicks -milliseconds]
ttk::label $w.splash -text "Committing" -anchor center -font myfont
place $w.splash -x 0 -y 0 -relwidth 1.0 -relheight 1.0
update
# Commit
|