git-gui: fix mixed tabs and spaces; prefer tabs
Spaces are replaced with tabs when possible. In some cases just replacing spaces with tabs would break readability, so it was left as it is. Signed-off-by: Serg Tereshchenko <serg.partizan@gmail.com> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
Serg Tereshchenko committed
Aug 23, 2020 at 01:24 UTC
5c1b391307b3a17eb859ef8716761ccc0bc54cba
1 file changed
+43
-43
git-gui.sh
+43
-43
@@ -947,15 +947,15 @@ if {![regsub {^git version } $_git_version {} _git_version]} {
947
}
948
949
proc get_trimmed_version {s} {
950
- set r {}
951
- foreach x [split $s -._] {
952
- if {[string is integer -strict $x]} {
953
- lappend r $x
954
- } else {
955
- break
956
- }
957
- }
958
- return [join $r .]
950
+ set r {}
951
+ foreach x [split $s -._] {
952
+ if {[string is integer -strict $x]} {
953
+ lappend r $x
954
+ } else {
955
+ break
956
+ }
957
+ }
958
+ return [join $r .]
959
}
960
set _real_git_version $_git_version
961
set _git_version [get_trimmed_version $_git_version]
@@ -967,7 +967,7 @@ if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
967
-type yesno \
968
-default no \
969
-title "[appname]: warning" \
970
- -message [mc "Git version cannot be determined.
970
+ -message [mc "Git version cannot be determined.
971
972
%s claims it is version '%s'.
973
@@ -1653,7 +1653,7 @@ proc prepare_commit_msg_hook_wait {fd_ph} {
1653
set pch_error {}
1654
catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1655
return
1656
- }
1656
+ }
1657
fconfigure $fd_ph -blocking 0
1658
catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1659
}
@@ -2001,72 +2001,72 @@ set filemask {
2001
#define mask_width 14
2002
#define mask_height 15
2003
static unsigned char mask_bits[] = {
2004
- 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2005
- 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2006
- 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2004
+ 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2005
+ 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2006
+ 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2007
}
2008
2009
image create bitmap file_plain -background white -foreground black -data {
2010
#define plain_width 14
2011
#define plain_height 15
2012
static unsigned char plain_bits[] = {
2013
- 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2014
- 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2015
- 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2013
+ 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2014
+ 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2015
+ 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2016
} -maskdata $filemask
2017
2018
image create bitmap file_mod -background white -foreground blue -data {
2019
#define mod_width 14
2020
#define mod_height 15
2021
static unsigned char mod_bits[] = {
2022
- 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2023
- 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2024
- 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2022
+ 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2023
+ 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2024
+ 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2025
} -maskdata $filemask
2026
2027
image create bitmap file_fulltick -background white -foreground "#007000" -data {
2028
#define file_fulltick_width 14
2029
#define file_fulltick_height 15
2030
static unsigned char file_fulltick_bits[] = {
2031
- 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2032
- 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2033
- 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2031
+ 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2032
+ 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2033
+ 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2034
} -maskdata $filemask
2035
2036
image create bitmap file_question -background white -foreground black -data {
2037
#define file_question_width 14
2038
#define file_question_height 15
2039
static unsigned char file_question_bits[] = {
2040
- 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2041
- 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2042
- 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2040
+ 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2041
+ 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2042
+ 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2043
} -maskdata $filemask
2044
2045
image create bitmap file_removed -background white -foreground red -data {
2046
#define file_removed_width 14
2047
#define file_removed_height 15
2048
static unsigned char file_removed_bits[] = {
2049
- 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2050
- 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2051
- 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2049
+ 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2050
+ 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2051
+ 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2052
} -maskdata $filemask
2053
2054
image create bitmap file_merge -background white -foreground blue -data {
2055
#define file_merge_width 14
2056
#define file_merge_height 15
2057
static unsigned char file_merge_bits[] = {
2058
- 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2059
- 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2060
- 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2058
+ 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2059
+ 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2060
+ 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2061
} -maskdata $filemask
2062
2063
image create bitmap file_statechange -background white -foreground green -data {
2064
#define file_statechange_width 14
2065
#define file_statechange_height 15
2066
static unsigned char file_statechange_bits[] = {
2067
- 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
2068
- 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
2069
- 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2067
+ 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
2068
+ 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
2069
+ 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2070
} -maskdata $filemask
2071
2072
set ui_index .vpane.files.index.list
@@ -3878,18 +3878,18 @@ proc on_application_mapped {} {
3878
set gm $repo_config(gui.geometry)
3879
if {$use_ttk} {
3880
bind .vpane <Map> \
3881
- [list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
3881
+ [list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
3882
bind .vpane.files <Map> \
3883
- [list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
3883
+ [list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
3884
} else {
3885
bind .vpane <Map> \
3886
- [list on_tk_pane_mapped %W 0 \
3887
- [lindex $gm 1] \
3888
- [lindex [.vpane sash coord 0] 1]]
3886
+ [list on_tk_pane_mapped %W 0 \
3887
+ [lindex $gm 1] \
3888
+ [lindex [.vpane sash coord 0] 1]]
3889
bind .vpane.files <Map> \
3890
- [list on_tk_pane_mapped %W 0 \
3891
- [lindex [.vpane.files sash coord 0] 0] \
3892
- [lindex $gm 2]]
3890
+ [list on_tk_pane_mapped %W 0 \
3891
+ [lindex [.vpane.files sash coord 0] 0] \
3892
+ [lindex $gm 2]]
3893
}
3894
wm geometry . [lindex $gm 0]
3895
}