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

git-gui: learn more type change states 

Support the following states with type change in git-gui: AT, MT, TD, TM

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
maint
Bert Wesarg 2010-12-09 21:46:23 +01:00 committed by Pat Thoyts
parent 4a065c8a6f
commit 7587f4d32f
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-gui.sh
View File

@ -1997,7 +1997,11 @@ foreach i {
{MD {mc "Staged for commit, missing"}} {MD {mc "Staged for commit, missing"}}


{_T {mc "File type changed, not staged"}} {_T {mc "File type changed, not staged"}}
{MT {mc "File type changed, old type staged for commit"}}
{AT {mc "File type changed, old type staged for commit"}}
{T_ {mc "File type changed, staged"}} {T_ {mc "File type changed, staged"}}
{TM {mc "File type change staged, modification not staged"}}
{TD {mc "File type change staged, file missing"}}


{_O {mc "Untracked, not staged"}} {_O {mc "Untracked, not staged"}}
{A_ {mc "Staged for commit"}} {A_ {mc "Staged for commit"}}
@ -3539,8 +3543,8 @@ proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
|| $current_diff_path eq {} || $current_diff_path eq {}
|| {__} eq $state || {__} eq $state
|| {_O} eq $state || {_O} eq $state
|| {_T} eq $state || [string match {?T} $state]
|| {T_} eq $state || [string match {T?} $state]
|| [has_textconv $current_diff_path]} { || [has_textconv $current_diff_path]} {
set s disabled set s disabled
} else { } else {

6
lib/commit.tcl
View File

@ -166,7 +166,7 @@ The rescan will be automatically started now.
_? {continue} _? {continue}
A? - A? -
D? - D? -
T_ - T? -
M? {set files_ready 1} M? {set files_ready 1}
_U - _U -
U? { U? {
@ -453,7 +453,11 @@ A rescan will be automatically started now.
} }
AM - AM -
AD - AD -
AT -
TM -
TD -
MM - MM -
MT -
MD { MD {
set file_states($path) [list \ set file_states($path) [list \
_[string index $m 1] \ _[string index $m 1] \

10
lib/index.tcl
View File

@ -103,8 +103,11 @@ proc write_update_indexinfo {fd pathList totalCnt batch after} {
set s $file_states($path) set s $file_states($path)
switch -glob -- [lindex $s 0] { switch -glob -- [lindex $s 0] {
A? {set new _O} A? {set new _O}
M? {set new _M} MT -
TM -
T_ {set new _T} T_ {set new _T}
M? {set new _M}
TD -
D_ {set new _D} D_ {set new _D}
D? {set new _?} D? {set new _?}
?? {continue} ?? {continue}
@ -167,7 +170,10 @@ proc write_update_index {fd pathList totalCnt batch after} {
AD {set new __} AD {set new __}
?D {set new D_} ?D {set new D_}
_O - _O -
AT -
AM {set new A_} AM {set new A_}
TM -
MT -
_T {set new T_} _T {set new T_}
_U - _U -
U? { U? {
@ -261,7 +267,7 @@ proc unstage_helper {txt paths} {
switch -glob -- [lindex $file_states($path) 0] { switch -glob -- [lindex $file_states($path) 0] {
A? - A? -
M? - M? -
T_ - T? -
D? { D? {
lappend pathList $path lappend pathList $path
if {$path eq $current_diff_path} { if {$path eq $current_diff_path} {