git-gui: Flip commit message buffer and diff area.

[git.git] / git-gui

diff --git a/git-gui b/git-gui
index 48e1c5601f813826f1abcf832d3ea6419254c559..83f713535f323f605a426bf27420c1dd22940ee6 100755 (executable)
--- a/git-gui
+++ b/git-gui
@@ -236,10 +236,13 @@ proc status_eof {fd buf final} {
        if {[eof $fd]} {
                set $buf {}
                close $fd
+
                if {[incr status_active -1] == 0} {
                        unlock_index
 
+                       display_all_files
                        set ui_status_value $final
+
                        if {$ui_fname_value != {} && [array names file_states \
                                -exact $ui_fname_value] != {}}  {
                                show_diff $ui_fname_value
@@ -661,11 +664,11 @@ proc push_to {remote} {
 ## ui helpers
 
 proc mapcol {state path} {
-       global all_cols
+       global all_cols ui_other
 
        if {[catch {set r $all_cols($state)}]} {
                puts "error: no column for state={$state} $path"
-               return o
+               return $ui_other
        }
        return $r
 }
@@ -711,79 +714,93 @@ proc bsearch {w path} {
        return -[expr $lo + 1]
 }
 
-proc merge_state {path state} {
-       global file_states
+set next_icon_id 0
+
+proc merge_state {path new_state} {
+       global file_states next_icon_id
 
-       if {[array names file_states -exact $path] == {}}  {
-               set o __
-               set s [list $o none none]
+       set s0 [string index $new_state 0]
+       set s1 [string index $new_state 1]
+
+       if {[catch {set info $file_states($path)}]} {
+               set state __
+               set icon n[incr next_icon_id]
        } else {
-               set s $file_states($path)
-               set o [lindex $s 0]
+               set state [lindex $info 0]
+               set icon [lindex $info 1]
        }
 
-       set m [lindex $s 0]
-       if {[string index $state 0] == "_"} {
-               set state [string index $m 0][string index $state 1]
-       } elseif {[string index $state 0] == "*"} {
-               set state _[string index $state 1]
+       if {$s0 == {_}} {
+               set s0 [string index $state 0]
+       } elseif {$s0 == {*}} {
+               set s0 _
        }
 
-       if {[string index $state 1] == "_"} {
-               set state [string index $state 0][string index $m 1]
-       } elseif {[string index $state 1] == "*"} {
-               set state [string index $state 0]_
+       if {$s1 == {_}} {
+               set s1 [string index $state 1]
+       } elseif {$s1 == {*}} {
+               set s1 _
        }
 
-       set file_states($path) [lreplace $s 0 0 $state]
-       return $o
+       set file_states($path) [list $s0$s1 $icon]
+       return $state
 }
 
 proc display_file {path state} {
-       global ui_index ui_other file_states
+       global ui_index ui_other file_states status_active
 
        set old_m [merge_state $path $state]
-       set s $file_states($path)
-       set m [lindex $s 0]
+       if {$status_active} return
 
-       if {[mapcol $m $path] == "o"} {
-               set ii 1
-               set ai 2
-               set iw $ui_index
-               set aw $ui_other
-       } else {
-               set ii 2
-               set ai 1
-               set iw $ui_other
-               set aw $ui_index
-       }
+       set s $file_states($path)
+       set new_m [lindex $s 0]
+       set new_w [mapcol $new_m $path] 
+       set old_w [mapcol $old_m $path]
+       set new_icon [mapicon $new_m $path]
 
-       set d [lindex $s $ii]
-       if {$d != "none"} {
-               set lno [bsearch $iw $path]
+       if {$new_w != $old_w} {
+               set lno [bsearch $old_w $path]
                if {$lno >= 0} {
                        incr lno
-                       $iw conf -state normal
-                       $iw delete $lno.0 [expr $lno + 1].0
-                       $iw conf -state disabled
-                       set s [lreplace $s $ii $ii none]
+                       $old_w conf -state normal
+                       $old_w delete $lno.0 [expr $lno + 1].0
+                       $old_w conf -state disabled
                }
+
+               set lno [expr abs([bsearch $new_w $path] + 1) + 1]
+               $new_w conf -state normal
+               $new_w image create $lno.0 \
+                       -align center -padx 5 -pady 1 \
+                       -name [lindex $s 1] \
+                       -image [mapicon $m $path]
+               $new_w insert $lno.1 "$path\n"
+               $new_w conf -state disabled
+       } elseif {$new_icon != [mapicon $old_m $path]} {
+               $new_w conf -state normal
+               $new_w image conf [lindex $s 1] -image $new_icon
+               $new_w conf -state disabled
        }
+}
+
+proc display_all_files {} {
+       global ui_index ui_other file_states
+
+       $ui_index conf -state normal
+       $ui_other conf -state normal
 
-       set d [lindex $s $ai]
-       if {$d == "none"} {
-               set lno [expr abs([bsearch $aw $path] + 1) + 1]
-               $aw conf -state normal
-               set ico [$aw image create $lno.0 \
+       foreach path [lsort [array names file_states]] {
+               set s $file_states($path)
+               set m [lindex $s 0]
+               set w [mapcol $m $path]
+               $w image create end \
                        -align center -padx 5 -pady 1 \
-                       -image [mapicon $m $path]]
-               $aw insert $lno.1 "$path\n"
-               $aw conf -state disabled
-               set file_states($path) [lreplace $s $ai $ai [list $ico]]
-       } elseif {[mapicon $m $path] != [mapicon $old_m $path]} {
-               set ico [lindex $d 0]
-               $aw image conf $ico -image [mapicon $m $path]
+                       -name [lindex $s 1] \
+                       -image [mapicon $m $path]
+               $w insert end "$path\n"
        }
+
+       $ui_index conf -state disabled
+       $ui_other conf -state disabled
 }
 
 proc with_update_index {body} {
@@ -998,6 +1015,8 @@ static unsigned char file_merge_bits[] = {
    0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
 } -maskdata $filemask
 
+set ui_index .vpane.files.index.list
+set ui_other .vpane.files.other.list
 set max_status_desc 0
 foreach i {
                {__ i plain    "Unmodified"}
@@ -1008,7 +1027,7 @@ foreach i {
                {_O o plain    "Untracked"}
                {A_ o fulltick "Added"}
                {AM o parttick "Partially added"}
-               {AD o question  "Added (but now gone)"}
+               {AD o question "Added (but now gone)"}
 
                {_D i question "Missing"}
                {D_ i removed  "Removed"}
@@ -1021,7 +1040,11 @@ foreach i {
        if {$max_status_desc < [string length [lindex $i 3]]} {
                set max_status_desc [string length [lindex $i 3]]
        }
-       set all_cols([lindex $i 0]) [lindex $i 1]
+       if {[lindex $i 1] == {i}} {
+               set all_cols([lindex $i 0]) $ui_index
+       } else {
+               set all_cols([lindex $i 0]) $ui_other
+       }
        set all_icons([lindex $i 0]) file_[lindex $i 2]
        set all_descs([lindex $i 0]) [lindex $i 3]
 }
@@ -1434,7 +1457,6 @@ panedwindow .vpane.files -orient horizontal
 pack .vpane -anchor n -side top -fill both -expand 1
 
 # -- Index File List
-set ui_index .vpane.files.index.list
 frame .vpane.files.index -height 100 -width 400
 label .vpane.files.index.title -text {Modified Files} \
        -background green \
@@ -1452,7 +1474,6 @@ pack $ui_index -side left -fill both -expand 1
 .vpane.files add .vpane.files.index -sticky nsew
 
 # -- Other (Add) File List
-set ui_other .vpane.files.other.list
 frame .vpane.files.other -height 100 -width 100
 label .vpane.files.other.title -text {Untracked Files} \
        -background red \
@@ -1472,101 +1493,56 @@ pack $ui_other -side left -fill both -expand 1
 $ui_index tag conf in_diff -font [concat $mainfont bold]
 $ui_other tag conf in_diff -font [concat $mainfont bold]
 
-# -- Diff Header
-set ui_fname_value {}
-set ui_fstatus_value {}
-frame .vpane.diff -height 200 -width 400
-frame .vpane.diff.header
-label .vpane.diff.header.l1 -text {File:} -font $mainfont
-label .vpane.diff.header.l2 -textvariable ui_fname_value \
-       -anchor w \
-       -justify left \
-       -font $mainfont
-label .vpane.diff.header.l3 -text {Status:} -font $mainfont
-label .vpane.diff.header.l4 -textvariable ui_fstatus_value \
-       -width $max_status_desc \
-       -anchor w \
-       -justify left \
-       -font $mainfont
-pack .vpane.diff.header.l1 -side left
-pack .vpane.diff.header.l2 -side left -fill x
-pack .vpane.diff.header.l4 -side right
-pack .vpane.diff.header.l3 -side right
-
-# -- Diff Body
-frame .vpane.diff.body
-set ui_diff .vpane.diff.body.t
-text $ui_diff -background white -borderwidth 0 \
-       -width 80 -height 15 -wrap none \
-       -font $difffont \
-       -xscrollcommand {.vpane.diff.body.sbx set} \
-       -yscrollcommand {.vpane.diff.body.sby set} \
-       -cursor $maincursor \
-       -state disabled
-scrollbar .vpane.diff.body.sbx -orient horizontal \
-       -command [list $ui_diff xview]
-scrollbar .vpane.diff.body.sby -orient vertical \
-       -command [list $ui_diff yview]
-pack .vpane.diff.body.sbx -side bottom -fill x
-pack .vpane.diff.body.sby -side right -fill y
-pack $ui_diff -side left -fill both -expand 1
-pack .vpane.diff.header -side top -fill x
-pack .vpane.diff.body -side bottom -fill both -expand 1
-.vpane add .vpane.diff -stick nsew
-
-$ui_diff tag conf dm -foreground red
-$ui_diff tag conf dp -foreground blue
-$ui_diff tag conf da -font [concat $difffont bold]
-$ui_diff tag conf di -foreground "#00a000"
-$ui_diff tag conf dni -foreground "#a000a0"
-$ui_diff tag conf bold -font [concat $difffont bold]
-
-# -- Commit Area
-frame .vpane.commarea -height 170
-.vpane add .vpane.commarea -stick nsew
+# -- Diff and Commit Area
+frame .vpane.lower -height 400 -width 400
+frame .vpane.lower.commarea
+frame .vpane.lower.diff -relief sunken -borderwidth 1
+pack .vpane.lower.commarea -side top -fill x
+pack .vpane.lower.diff -side bottom -fill both -expand 1
+.vpane add .vpane.lower -stick nsew
 
 # -- Commit Area Buttons
-frame .vpane.commarea.buttons
-label .vpane.commarea.buttons.l -text {} \
+frame .vpane.lower.commarea.buttons
+label .vpane.lower.commarea.buttons.l -text {} \
        -anchor w \
        -justify left \
        -font $mainfont
-pack .vpane.commarea.buttons.l -side top -fill x
-pack .vpane.commarea.buttons -side left -fill y
+pack .vpane.lower.commarea.buttons.l -side top -fill x
+pack .vpane.lower.commarea.buttons -side left -fill y
 
-button .vpane.commarea.buttons.rescan -text {Rescan} \
+button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
        -command do_rescan \
        -font $mainfont
-pack .vpane.commarea.buttons.rescan -side top -fill x
-lappend disable_on_lock {.vpane.commarea.buttons.rescan conf -state}
+pack .vpane.lower.commarea.buttons.rescan -side top -fill x
+lappend disable_on_lock {.vpane.lower.commarea.buttons.rescan conf -state}
 
-button .vpane.commarea.buttons.amend -text {Amend Last} \
+button .vpane.lower.commarea.buttons.amend -text {Amend Last} \
        -command do_amend_last \
        -font $mainfont
-pack .vpane.commarea.buttons.amend -side top -fill x
-lappend disable_on_lock {.vpane.commarea.buttons.amend conf -state}
+pack .vpane.lower.commarea.buttons.amend -side top -fill x
+lappend disable_on_lock {.vpane.lower.commarea.buttons.amend conf -state}
 
-button .vpane.commarea.buttons.ciall -text {Check-in All} \
+button .vpane.lower.commarea.buttons.ciall -text {Check-in All} \
        -command do_checkin_all \
        -font $mainfont
-pack .vpane.commarea.buttons.ciall -side top -fill x
-lappend disable_on_lock {.vpane.commarea.buttons.ciall conf -state}
+pack .vpane.lower.commarea.buttons.ciall -side top -fill x
+lappend disable_on_lock {.vpane.lower.commarea.buttons.ciall conf -state}
 
-button .vpane.commarea.buttons.signoff -text {Sign Off} \
+button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
        -command do_signoff \
        -font $mainfont
-pack .vpane.commarea.buttons.signoff -side top -fill x
+pack .vpane.lower.commarea.buttons.signoff -side top -fill x
 
-button .vpane.commarea.buttons.commit -text {Commit} \
+button .vpane.lower.commarea.buttons.commit -text {Commit} \
        -command do_commit \
        -font $mainfont
-pack .vpane.commarea.buttons.commit -side top -fill x
-lappend disable_on_lock {.vpane.commarea.buttons.commit conf -state}
+pack .vpane.lower.commarea.buttons.commit -side top -fill x
+lappend disable_on_lock {.vpane.lower.commarea.buttons.commit conf -state}
 
 # -- Commit Message Buffer
-frame .vpane.commarea.buffer
-set ui_comm .vpane.commarea.buffer.t
-set ui_coml .vpane.commarea.buffer.l
+frame .vpane.lower.commarea.buffer
+set ui_comm .vpane.lower.commarea.buffer.t
+set ui_coml .vpane.lower.commarea.buffer.l
 label $ui_coml -text {Commit Message:} \
        -anchor w \
        -justify left \
@@ -1580,15 +1556,68 @@ trace add variable commit_type write {uplevel #0 {
 }}
 text $ui_comm -background white -borderwidth 1 \
        -relief sunken \
-       -width 75 -height 10 -wrap none \
+       -width 75 -height 9 -wrap none \
        -font $difffont \
-       -yscrollcommand {.vpane.commarea.buffer.sby set} \
+       -yscrollcommand {.vpane.lower.commarea.buffer.sby set} \
        -cursor $maincursor
-scrollbar .vpane.commarea.buffer.sby -command [list $ui_comm yview]
+scrollbar .vpane.lower.commarea.buffer.sby -command [list $ui_comm yview]
 pack $ui_coml -side top -fill x
-pack .vpane.commarea.buffer.sby -side right -fill y
+pack .vpane.lower.commarea.buffer.sby -side right -fill y
 pack $ui_comm -side left -fill y
-pack .vpane.commarea.buffer -side left -fill y
+pack .vpane.lower.commarea.buffer -side left -fill y
+
+# -- Diff Header
+set ui_fname_value {}
+set ui_fstatus_value {}
+frame .vpane.lower.diff.header -background orange
+label .vpane.lower.diff.header.l1 -text {File:} \
+       -background orange \
+       -font $mainfont
+label .vpane.lower.diff.header.l2 -textvariable ui_fname_value \
+       -background orange \
+       -anchor w \
+       -justify left \
+       -font $mainfont
+label .vpane.lower.diff.header.l3 -text {Status:} \
+       -background orange \
+       -font $mainfont
+label .vpane.lower.diff.header.l4 -textvariable ui_fstatus_value \
+       -background orange \
+       -width $max_status_desc \
+       -anchor w \
+       -justify left \
+       -font $mainfont
+pack .vpane.lower.diff.header.l1 -side left
+pack .vpane.lower.diff.header.l2 -side left -fill x
+pack .vpane.lower.diff.header.l4 -side right
+pack .vpane.lower.diff.header.l3 -side right
+
+# -- Diff Body
+frame .vpane.lower.diff.body
+set ui_diff .vpane.lower.diff.body.t
+text $ui_diff -background white -borderwidth 0 \
+       -width 80 -height 15 -wrap none \
+       -font $difffont \
+       -xscrollcommand {.vpane.lower.diff.body.sbx set} \
+       -yscrollcommand {.vpane.lower.diff.body.sby set} \
+       -cursor $maincursor \
+       -state disabled
+scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
+       -command [list $ui_diff xview]
+scrollbar .vpane.lower.diff.body.sby -orient vertical \
+       -command [list $ui_diff yview]
+pack .vpane.lower.diff.body.sbx -side bottom -fill x
+pack .vpane.lower.diff.body.sby -side right -fill y
+pack $ui_diff -side left -fill both -expand 1
+pack .vpane.lower.diff.header -side top -fill x
+pack .vpane.lower.diff.body -side bottom -fill both -expand 1
+
+$ui_diff tag conf dm -foreground red
+$ui_diff tag conf dp -foreground blue
+$ui_diff tag conf da -font [concat $difffont bold]
+$ui_diff tag conf di -foreground "#00a000"
+$ui_diff tag conf dni -foreground "#a000a0"
+$ui_diff tag conf bold -font [concat $difffont bold]
 
 # -- Status Bar
 set ui_status_value {Initializing...}