kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-gui: Update in memory states after commit. 

In order to allow the user to toggle include/exclude from next commit
for files which were partially included in the last commit we need the
current index mode+sha1 data stored in our file_states array.  For
any partially included file we have this information from diff-files,
so we just have to copy it over to the diff-index portion of our state
array.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
main
Shawn O. Pearce 2006-11-19 03:38:48 -05:00
parent bd11b82db8
commit a29481e212
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
git-gui
View File

@ -922,7 +922,7 @@ proc commit_writetree {curHEAD msg} {
proc commit_committree {fd_wt curHEAD msg} { proc commit_committree {fd_wt curHEAD msg} {
global single_commit gitdir HEAD PARENT commit_type tcl_platform global single_commit gitdir HEAD PARENT commit_type tcl_platform
global ui_status_value ui_comm selected_commit_type global ui_status_value ui_comm selected_commit_type
global file_states selected_paths global file_states selected_paths rescan_active


gets $fd_wt tree_id gets $fd_wt tree_id
if {$tree_id eq {} || [catch {close $fd_wt} err]} { if {$tree_id eq {} || [catch {close $fd_wt} err]} {
@ -1018,7 +1018,7 @@ proc commit_committree {fd_wt curHEAD msg} {


if {$single_commit} do_quit if {$single_commit} do_quit


# -- Update status without invoking any git commands. # -- Update in memory status
# #
set commit_type normal set commit_type normal
set selected_commit_type new set selected_commit_type new
@ -1029,18 +1029,29 @@ proc commit_committree {fd_wt curHEAD msg} {
set s $file_states($path) set s $file_states($path)
set m [lindex $s 0] set m [lindex $s 0]
switch -glob -- $m { switch -glob -- $m {
DD - _O -
AO {set m __} _M -
A? - _D {continue}
M? - __ -
D? {set m _[string index $m 1]} A_ -
} M_ -

DD {
if {$m eq {__}} {
unset file_states($path) unset file_states($path)
catch {unset selected_paths($path)} catch {unset selected_paths($path)}
} else { }
lset file_states($path) 0 $m DO {
set file_states($path) [list _O [lindex $s 1] {} {}]
}
AM -
AD -
MM -
DM {
set file_states($path) [list \
_[string index $m 1] \
[lindex $s 1] \
[lindex $s 3] \
{}]
}
} }
} }


@ -1661,9 +1672,9 @@ foreach i {
{AD o question "Added (but now gone)"} {AD o question "Added (but now gone)"}


{_D i question "Missing"} {_D i question "Missing"}
{D_ i removed "Removed by commit"}
{DD i removed "Removed by commit"} {DD i removed "Removed by commit"}
{DO i removed "Removed (still exists)"} {DO i removed "Removed (still exists)"}
{DM i removed "Removed (but modified)"}


{UM i merge "Merge conflicts"} {UM i merge "Merge conflicts"}
{U_ i merge "Merge conflicts"} {U_ i merge "Merge conflicts"}
@ -2424,7 +2435,6 @@ proc toggle_or_diff {w x y} {
} }
switch -glob -- [lindex $file_states($path) 0] { switch -glob -- [lindex $file_states($path) 0] {
A_ - A_ -
AO -
M_ - M_ -
DD - DD -
D_ { D_ {