{"thread":{"id":"26009","subject":"[PATCH 1/3] git-gui: fix typo in image data","startedAt":"2010-12-09T20:46:21Z","lastAt":"2011-01-28T09:34:08Z","messageCount":4,"participants":["Bert Wesarg","Pat Thoyts"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"157716","messageId":"c373e73fb114ebc580c36bc494dc62f80a19ece9.1291927374.git.bert.wesarg@googlemail.com","threadId":"26009","inReplyTo":null,"subject":"[PATCH 1/3] git-gui: fix typo in image data","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2010-12-09T20:46:21Z","receivedAt":"2010-12-09T20:46:21Z","isPatch":true,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"Signed-off-by: Bert Wesarg \n---\n git-gui.sh | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-gui.sh b/git-gui.sh\nindex c85a53c..3ef9129 100755\n--- a/git-gui.sh\n+++ b/git-gui.sh\n@@ -1958,8 +1958,8 @@ static unsigned char file_merge_bits[] = {\n } -maskdata $filemask\n \n image create bitmap file_statechange -background white -foreground green -data {\n-#define file_merge_width 14\n-#define file_merge_height 15\n+#define file_statechange_width 14\n+#define file_statechange_height 15\n static unsigned char file_statechange_bits[] = {\n 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,\n 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,\n-- \n1.7.3.2.1200.ge4bf6\n"},{"id":"157717","messageId":"ab91f8f7447c20f518554c57c4f85483cab4ee2f.1291927374.git.bert.wesarg@googlemail.com","threadId":"26009","inReplyTo":"c373e73fb114ebc580c36bc494dc62f80a19ece9.1291927374.git.bert.wesarg@googlemail.com","subject":"[PATCH 2/3] git-gui: remove 'no such variable' for s error when encounter unknown file states","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2010-12-09T20:46:22Z","receivedAt":"2010-12-09T20:46:22Z","isPatch":true,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"$s will be referenced in the error message. Which was broken since\n\"git-gui: Automatically update-index all included files before commit\"\n(bbe3b3b, 2006-11-16).\n\nSigned-off-by: Bert Wesarg \n---\n lib/commit.tcl | 3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/lib/commit.tcl b/lib/commit.tcl\nindex 7f459cd..83b3d9d 100644\n--- a/lib/commit.tcl\n+++ b/lib/commit.tcl\n@@ -161,7 +161,8 @@ The rescan will be automatically started now.\n \t#\n \tset files_ready 0\n \tforeach path [array names file_states] {\n-\t\tswitch -glob -- [lindex $file_states($path) 0] {\n+\t\tset s $file_states($path)\n+\t\tswitch -glob -- [lindex $s 0] {\n \t\t_? {continue}\n \t\tA? -\n \t\tD? -\n-- \n1.7.3.2.1200.ge4bf6\n"},{"id":"157718","messageId":"ae3adad905c1d55d111dcdc3f231b1d85dca26d5.1291927374.git.bert.wesarg@googlemail.com","threadId":"26009","inReplyTo":"ab91f8f7447c20f518554c57c4f85483cab4ee2f.1291927374.git.bert.wesarg@googlemail.com","subject":"[PATCH 3/3] git-gui: learn more type change states","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2010-12-09T20:46:23Z","receivedAt":"2010-12-09T20:46:23Z","isPatch":true,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"Support the following states with type change in git-gui: AT, MT, TD, TM\n\nSigned-off-by: Bert Wesarg \n\n---\n\nCc: Gustaf Hendeby \n---\n git-gui.sh | 8 ++++++--\n lib/commit.tcl | 6 +++++-\n lib/index.tcl | 10 ++++++++--\n 3 files changed, 19 insertions(+), 5 deletions(-)\n\ndiff --git a/git-gui.sh b/git-gui.sh\nindex 3ef9129..f50a5fc 100755\n--- a/git-gui.sh\n+++ b/git-gui.sh\n@@ -1993,7 +1993,11 @@ foreach i {\n \t\t{MD {mc \"Staged for commit, missing\"}}\n \n \t\t{_T {mc \"File type changed, not staged\"}}\n+\t\t{MT {mc \"File type changed, old type staged for commit\"}}\n+\t\t{AT {mc \"File type changed, old type staged for commit\"}}\n \t\t{T_ {mc \"File type changed, staged\"}}\n+\t\t{TM {mc \"File type change staged, modification not staged\"}}\n+\t\t{TD {mc \"File type change staged, file missing\"}}\n \n \t\t{_O {mc \"Untracked, not staged\"}}\n \t\t{A_ {mc \"Staged for commit\"}}\n@@ -3535,8 +3539,8 @@ proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {\n \t\t\t|| $current_diff_path eq {}\n \t\t\t|| {__} eq $state\n \t\t\t|| {_O} eq $state\n-\t\t\t|| {_T} eq $state\n-\t\t\t|| {T_} eq $state\n+\t\t\t|| [string match {?T} $state]\n+\t\t\t|| [string match {T?} $state]\n \t\t\t|| [has_textconv $current_diff_path]} {\n \t\t\tset s disabled\n \t\t} else {\ndiff --git a/lib/commit.tcl b/lib/commit.tcl\nindex 83b3d9d..5ce4687 100644\n--- a/lib/commit.tcl\n+++ b/lib/commit.tcl\n@@ -166,7 +166,7 @@ The rescan will be automatically started now.\n \t\t_? {continue}\n \t\tA? -\n \t\tD? -\n-\t\tT_ -\n+\t\tT? -\n \t\tM? {set files_ready 1}\n \t\t_U -\n \t\tU? {\n@@ -453,7 +453,11 @@ A rescan will be automatically started now.\n \t\t}\n \t\tAM -\n \t\tAD -\n+\t\tAT -\n+\t\tTM -\n+\t\tTD -\n \t\tMM -\n+\t\tMT -\n \t\tMD {\n \t\t\tset file_states($path) [list \\\n \t\t\t\t_[string index $m 1] \\\ndiff --git a/lib/index.tcl b/lib/index.tcl\nindex e9db0c4..5d7bbf2 100644\n--- a/lib/index.tcl\n+++ b/lib/index.tcl\n@@ -103,8 +103,11 @@ proc write_update_indexinfo {fd pathList totalCnt batch after} {\n \t\tset s $file_states($path)\n \t\tswitch -glob -- [lindex $s 0] {\n \t\tA? {set new _O}\n-\t\tM? {set new _M}\n+\t\tMT -\n+\t\tTM -\n \t\tT_ {set new _T}\n+\t\tM? {set new _M}\n+\t\tTD -\n \t\tD_ {set new _D}\n \t\tD? {set new _?}\n \t\t?? {continue}\n@@ -167,7 +170,10 @@ proc write_update_index {fd pathList totalCnt batch after} {\n \t\tAD {set new __}\n \t\t?D {set new D_}\n \t\t_O -\n+\t\tAT -\n \t\tAM {set new A_}\n+\t\tTM -\n+\t\tMT -\n \t\t_T {set new T_}\n \t\t_U -\n \t\tU? {\n@@ -261,7 +267,7 @@ proc unstage_helper {txt paths} {\n \t\tswitch -glob -- [lindex $file_states($path) 0] {\n \t\tA? -\n \t\tM? -\n-\t\tT_ -\n+\t\tT? -\n \t\tD? {\n \t\t\tlappend pathList $path\n \t\t\tif {$path eq $current_diff_path} {\n-- \n1.7.3.2.1200.ge4bf6\n"},{"id":"159971","messageId":"87zkql5q3z.fsf@fox.patthoyts.tk","threadId":"26009","inReplyTo":"c373e73fb114ebc580c36bc494dc62f80a19ece9.1291927374.git.bert.wesarg@googlemail.com","subject":"Re: [PATCH 1/3] git-gui: fix typo in image data","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2011-01-28T09:34:08Z","receivedAt":"2011-01-28T09:34:08Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"\nThis patchset look fine - thank you, applying to master.\n\n-- \nPat Thoyts http://www.patthoyts.tk/\nPGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD\n"}]}