{"thread":{"id":"54091","subject":"style(git-gui): Fix mixed tabs & spaces; Always use tabs.","startedAt":"2020-08-22T10:56:49Z","lastAt":"2020-09-22T10:02:10Z","messageCount":6,"participants":["Serg Tereshchenko","Junio C Hamano","Pratyush Yadav"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"404252","messageId":"20200822105616.68296-1-serg.partizan@gmail.com","threadId":"54091","inReplyTo":null,"subject":"style(git-gui): Fix mixed tabs & spaces; Always use tabs.","fromName":"Serg Tereshchenko","fromEmail":"serg.partizan@gmail.com","sentAt":"2020-08-22T10:56:16Z","receivedAt":"2020-08-22T10:56:49Z","isPatch":false,"sender":{"key":"serg.partizan@gmail.com","avatar":"https://avatars.githubusercontent.com/u/301015?v=4"},"body":"Hello.\n\nI want to improve styling of git-citool, so it supports dark themes.\nBut first i want to remove \"mixed indent warning\" from my editor\nmodeline.\n\nThis patch does not change anything besides indents, and sometimes i\nreplace\n\n```tcl\nif {long ||\n multiline ||\n statement}\n```\n\nwith more readable\n\n```tcl\nif {\n long\n || multiline\n || statement\n}\n```\nBut only in lines with mixed indents.\n\n\nTo clearly see changes in this patch, instruct your editor to display\ntabs.\nI use this in vim:\n\n```vim\nset list\nset listchars=eol:¬,tab:\\ \\ ┊,trail:·,nbsp:⎵\n```\n\n\nBtw, at the start of git-gui.sh there is sanity check requiring Tcl 8.5.\nAnd somewhere later legacy code for 8.4.\n\nI would like to clean it up. Should i do this or better leave it as it\nis?\n\n\ndiff --git a/git-gui.sh b/git-gui.sh\nindex 49bd86e..ca66a8e 100755\n--- a/git-gui.sh\n+++ b/git-gui.sh\n@@ -1,13 +1,10 @@\n #!/bin/sh\n # Tcl ignores the next line -*- tcl -*- \\\n- if test \"z$*\" = zversion \\\n- || test \"z$*\" = z--version; \\\n- then \\\n-\techo 'git-gui version @@GITGUI_VERSION@@'; \\\n-\texit; \\\n- fi; \\\n- argv0=$0; \\\n- exec wish \"$argv0\" -- \"$@\"\n+if test \"z$*\" = zversion || test \"z$*\" = z--version; \\\n+\tthen echo 'git-gui version @@GITGUI_VERSION@@'; exit; \\\n+fi; \\\n+argv0=$0; \\\n+exec wish \"$argv0\" -- \"$@\"\n \n set appvers {@@GITGUI_VERSION@@}\n set copyright [string map [list (c) \\u00a9] {\n@@ -31,7 +28,7 @@ along with this program; if not, see .}]\n ## Tcl/Tk sanity check\n \n if {[catch {package require Tcl 8.5} err]\n- || [catch {package require Tk 8.5} err]\n+\t|| [catch {package require Tk 8.5} err]\n } {\n \tcatch {wm withdraw .}\n \ttk_messageBox \\\n@@ -404,9 +401,9 @@ proc _git_cmd {name} {\n \n \tif {[catch {set v $_git_cmd_path($name)}]} {\n \t\tswitch -- $name {\n-\t\t version -\n-\t\t--version -\n-\t\t--exec-path { return [list $::_git $name] }\n+\t\t\tversion -\n+\t\t\t--version -\n+\t\t\t--exec-path { return [list $::_git $name] }\n \t\t}\n \n \t\tset p [gitexec git-$name$::_search_exe]\n@@ -548,9 +545,10 @@ proc _open_stdout_stderr {cmd} {\n \tif {[catch {\n \t\t\tset fd [open [concat [list | ] $cmd] r]\n \t\t} err]} {\n-\t\tif { [lindex $cmd end] eq {2>@1}\n-\t\t && $err eq {can not find channel named \"1\"}\n-\t\t\t} {\n+\t\tif {\n+\t\t\t[lindex $cmd end] eq {2>@1}\n+\t\t\t&& $err eq {can not find channel named \"1\"}\n+\t\t} {\n \t\t\t# Older versions of Tcl 8.4 don't have this 2>@1 IO\n \t\t\t# redirect operator. Fallback to |& cat for those.\n \t\t\t# The command was not actually started, so its safe\n@@ -947,15 +945,15 @@ if {![regsub {^git version } $_git_version {} _git_version]} {\n }\n \n proc get_trimmed_version {s} {\n- set r {}\n- foreach x [split $s -._] {\n- if {[string is integer -strict $x]} {\n- lappend r $x\n- } else {\n- break\n- }\n- }\n- return [join $r .]\n+\tset r {}\n+\tforeach x [split $s -._] {\n+\t\tif {[string is integer -strict $x]} {\n+\t\t\tlappend r $x\n+\t\t} else {\n+\t\t\tbreak\n+\t\t}\n+\t}\n+\treturn [join $r .]\n }\n set _real_git_version $_git_version\n set _git_version [get_trimmed_version $_git_version]\n@@ -967,7 +965,7 @@ if {![regexp {^[1-9]+(\\.[0-9]+)+$} $_git_version]} {\n \t\t-type yesno \\\n \t\t-default no \\\n \t\t-title \"[appname]: warning\" \\\n-\t\t -message [mc \"Git version cannot be determined.\n+\t\t-message [mc \"Git version cannot be determined.\n \n %s claims it is version '%s'.\n \n@@ -975,7 +973,7 @@ if {![regexp {^[1-9]+(\\.[0-9]+)+$} $_git_version]} {\n \n Assume '%s' is version 1.5.0?\n \" $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {\n-\t\tset _git_version 1.5.0\n+\tset _git_version 1.5.0\n \t} else {\n \t\texit 1\n \t}\n@@ -1181,44 +1179,44 @@ enable_option transport\n disable_option bare\n \n switch -- $subcommand {\n-browser -\n-blame {\n-\tenable_option bare\n-\n-\tdisable_option multicommit\n-\tdisable_option branch\n-\tdisable_option transport\n-}\n-citool {\n-\tenable_option singlecommit\n-\tenable_option retcode\n-\n-\tdisable_option multicommit\n-\tdisable_option branch\n-\tdisable_option transport\n+\tbrowser -\n+\tblame {\n+\t\tenable_option bare\n+\n+\t\tdisable_option multicommit\n+\t\tdisable_option branch\n+\t\tdisable_option transport\n+\t}\n+\tcitool {\n+\t\tenable_option singlecommit\n+\t\tenable_option retcode\n+\n+\t\tdisable_option multicommit\n+\t\tdisable_option branch\n+\t\tdisable_option transport\n+\n+\t\twhile {[llength $argv] > 0} {\n+\t\t\tset a [lindex $argv 0]\n+\t\t\tswitch -- $a {\n+\t\t\t\t--amend {\n+\t\t\t\t\tenable_option initialamend\n+\t\t\t\t}\n+\t\t\t\t--nocommit {\n+\t\t\t\t\tenable_option nocommit\n+\t\t\t\t\tenable_option nocommitmsg\n+\t\t\t\t}\n+\t\t\t\t--commitmsg {\n+\t\t\t\t\tdisable_option nocommitmsg\n+\t\t\t\t}\n+\t\t\t\tdefault {\n+\t\t\t\t\tbreak\n+\t\t\t\t}\n+\t\t\t}\n \n-\twhile {[llength $argv] > 0} {\n-\t\tset a [lindex $argv 0]\n-\t\tswitch -- $a {\n-\t\t--amend {\n-\t\t\tenable_option initialamend\n+\t\t\tset argv [lrange $argv 1 end]\n \t\t}\n-\t\t--nocommit {\n-\t\t\tenable_option nocommit\n-\t\t\tenable_option nocommitmsg\n-\t\t}\n-\t\t--commitmsg {\n-\t\t\tdisable_option nocommitmsg\n-\t\t}\n-\t\tdefault {\n-\t\t\tbreak\n-\t\t}\n-\t\t}\n-\n-\t\tset argv [lrange $argv 1 end]\n \t}\n }\n-}\n \n ######################################################################\n ##\n@@ -1237,15 +1235,15 @@ if {![info exists env(SSH_ASKPASS)]} {\n \n set picked 0\n if {[catch {\n-\t\tset _gitdir $env(GIT_DIR)\n-\t\tset _prefix {}\n-\t\t}]\n-\t&& [catch {\n-\t\t# beware that from the .git dir this sets _gitdir to .\n-\t\t# and _prefix to the empty string\n-\t\tset _gitdir [git rev-parse --git-dir]\n-\t\tset _prefix [git rev-parse --show-prefix]\n-\t} err]} {\n+\tset _gitdir $env(GIT_DIR)\n+\tset _prefix {}\n+}]\n+&& [catch {\n+\t# beware that from the .git dir this sets _gitdir to .\n+\t# and _prefix to the empty string\n+\tset _gitdir [git rev-parse --git-dir]\n+\tset _prefix [git rev-parse --show-prefix]\n+} err]} {\n \tload_config 1\n \tapply_config\n \tchoose_repository::pick\n@@ -1653,7 +1651,7 @@ proc prepare_commit_msg_hook_wait {fd_ph} {\n \t\tset pch_error {}\n \t\tcatch {file delete [gitdir PREPARE_COMMIT_MSG]}\n \t\treturn\n- }\n+\t}\n \tfconfigure $fd_ph -blocking 0\n \tcatch {file delete [gitdir PREPARE_COMMIT_MSG]}\n }\n@@ -2001,72 +1999,72 @@ set filemask {\n #define mask_width 14\n #define mask_height 15\n static unsigned char mask_bits[] = {\n- 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,\n- 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,\n- 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};\n+\t0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,\n+\t0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,\n+\t0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};\n }\n \n image create bitmap file_plain -background white -foreground black -data {\n #define plain_width 14\n #define plain_height 15\n static unsigned char plain_bits[] = {\n- 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,\n- 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,\n- 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};\n+\t0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,\n+\t0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,\n+\t0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};\n } -maskdata $filemask\n \n image create bitmap file_mod -background white -foreground blue -data {\n #define mod_width 14\n #define mod_height 15\n static unsigned char mod_bits[] = {\n- 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,\n- 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,\n- 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};\n+\t0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,\n+\t0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,\n+\t0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};\n } -maskdata $filemask\n \n image create bitmap file_fulltick -background white -foreground \"#007000\" -data {\n #define file_fulltick_width 14\n #define file_fulltick_height 15\n static unsigned char file_fulltick_bits[] = {\n- 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,\n- 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,\n- 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};\n+\t0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,\n+\t0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,\n+\t0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};\n } -maskdata $filemask\n \n image create bitmap file_question -background white -foreground black -data {\n #define file_question_width 14\n #define file_question_height 15\n static unsigned char file_question_bits[] = {\n- 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,\n- 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,\n- 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};\n+\t0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,\n+\t0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,\n+\t0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};\n } -maskdata $filemask\n \n image create bitmap file_removed -background white -foreground red -data {\n #define file_removed_width 14\n #define file_removed_height 15\n static unsigned char file_removed_bits[] = {\n- 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,\n- 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,\n- 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};\n+\t0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,\n+\t0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,\n+\t0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};\n } -maskdata $filemask\n \n image create bitmap file_merge -background white -foreground blue -data {\n #define file_merge_width 14\n #define file_merge_height 15\n static unsigned char file_merge_bits[] = {\n- 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,\n- 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,\n- 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};\n+\t0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,\n+\t0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,\n+\t0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};\n } -maskdata $filemask\n \n image create bitmap file_statechange -background white -foreground green -data {\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- 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};\n+\t0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,\n+\t0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,\n+\t0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};\n } -maskdata $filemask\n \n set ui_index .vpane.files.index.list\n@@ -2088,36 +2086,36 @@ set all_icons(T$ui_workdir) file_statechange\n \n set max_status_desc 0\n foreach i {\n-\t\t{__ {mc \"Unmodified\"}}\n-\n-\t\t{_M {mc \"Modified, not staged\"}}\n-\t\t{M_ {mc \"Staged for commit\"}}\n-\t\t{MM {mc \"Portions staged for commit\"}}\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-\t\t{AM {mc \"Portions staged for commit\"}}\n-\t\t{AD {mc \"Staged for commit, missing\"}}\n-\n-\t\t{_D {mc \"Missing\"}}\n-\t\t{D_ {mc \"Staged for removal\"}}\n-\t\t{DO {mc \"Staged for removal, still present\"}}\n-\n-\t\t{_U {mc \"Requires merge resolution\"}}\n-\t\t{U_ {mc \"Requires merge resolution\"}}\n-\t\t{UU {mc \"Requires merge resolution\"}}\n-\t\t{UM {mc \"Requires merge resolution\"}}\n-\t\t{UD {mc \"Requires merge resolution\"}}\n-\t\t{UT {mc \"Requires merge resolution\"}}\n-\t} {\n+\t{__ {mc \"Unmodified\"}}\n+\n+\t{_M {mc \"Modified, not staged\"}}\n+\t{M_ {mc \"Staged for commit\"}}\n+\t{MM {mc \"Portions staged for commit\"}}\n+\t{MD {mc \"Staged for commit, missing\"}}\n+\n+\t{_T {mc \"File type changed, not staged\"}}\n+\t{MT {mc \"File type changed, old type staged for commit\"}}\n+\t{AT {mc \"File type changed, old type staged for commit\"}}\n+\t{T_ {mc \"File type changed, staged\"}}\n+\t{TM {mc \"File type change staged, modification not staged\"}}\n+\t{TD {mc \"File type change staged, file missing\"}}\n+\n+\t{_O {mc \"Untracked, not staged\"}}\n+\t{A_ {mc \"Staged for commit\"}}\n+\t{AM {mc \"Portions staged for commit\"}}\n+\t{AD {mc \"Staged for commit, missing\"}}\n+\n+\t{_D {mc \"Missing\"}}\n+\t{D_ {mc \"Staged for removal\"}}\n+\t{DO {mc \"Staged for removal, still present\"}}\n+\n+\t{_U {mc \"Requires merge resolution\"}}\n+\t{U_ {mc \"Requires merge resolution\"}}\n+\t{UU {mc \"Requires merge resolution\"}}\n+\t{UM {mc \"Requires merge resolution\"}}\n+\t{UD {mc \"Requires merge resolution\"}}\n+\t{UT {mc \"Requires merge resolution\"}}\n+} {\n \tset text [eval [lindex $i 1]]\n \tif {$max_status_desc < [string length $text]} {\n \t\tset max_status_desc [string length $text]\n@@ -2475,8 +2473,10 @@ proc next_diff_after_action {w path {lno {}} {mmask {}}} {\n proc select_first_diff {after} {\n \tglobal ui_workdir\n \n-\tif {[find_next_diff $ui_workdir {} 1 {^_?U}] ||\n-\t [find_next_diff $ui_workdir {} 1 {[^O]$}]} {\n+\tif {\n+\t\t[find_next_diff $ui_workdir {} 1 {^_?U}]\n+\t\t|| [find_next_diff $ui_workdir {} 1 {[^O]$}]\n+\t} {\n \t\tnext_diff $after\n \t} else {\n \t\tuplevel #0 $after\n@@ -3111,8 +3111,11 @@ proc normalize_relpath {path} {\n \tset elements {}\n \tforeach item [file split $path] {\n \t\tif {$item eq {.}} continue\n-\t\tif {$item eq {..} && [llength $elements] > 0\n-\t\t && [lindex $elements end] ne {..}} {\n+\t\tif {\n+\t\t\t$item eq {..}\n+\t\t\t&& [llength $elements] > 0\n+\t\t\t&& [lindex $elements end] ne {..}\n+\t\t} {\n \t\t\tset elements [lrange $elements 0 end-1]\n \t\t\tcontinue\n \t\t}\n@@ -3878,18 +3881,18 @@ proc on_application_mapped {} {\n \tset gm $repo_config(gui.geometry)\n \tif {$use_ttk} {\n \t\tbind .vpane