mirror of
https://github.com/git/git.git
synced 2024-06-03 13:26:29 +02:00
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>
This commit is contained in:
Serg Tereshchenko
Pratyush Yadav
parent
469725c1a3
commit
5c1b391307
86
git-gui.sh
86
git-gui.sh
|
|
@ -947,15 +947,15 @@ if {![regsub {^git version } $_git_version {} _git_version]} {
|
|||
}
|
||||
|
||||
proc get_trimmed_version {s} {
|
||||
set r {}
|
||||
foreach x [split $s -._] {
|
||||
if {[string is integer -strict $x]} {
|
||||
lappend r $x
|
||||
} else {
|
||||
break
|
||||
}
|
||||
}
|
||||
return [join $r .]
|
||||
set r {}
|
||||
foreach x [split $s -._] {
|
||||
if {[string is integer -strict $x]} {
|
||||
lappend r $x
|
||||
} else {
|
||||
break
|
||||
}
|
||||
}
|
||||
return [join $r .]
|
||||
}
|
||||
set _real_git_version $_git_version
|
||||
set _git_version [get_trimmed_version $_git_version]
|
||||
|
|
@ -967,7 +967,7 @@ if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
|
|||
-type yesno \
|
||||
-default no \
|
||||
-title "[appname]: warning" \
|
||||
-message [mc "Git version cannot be determined.
|
||||
-message [mc "Git version cannot be determined.
|
||||
|
||||
%s claims it is version '%s'.
|
||||
|
||||
|
|
@ -1653,7 +1653,7 @@ proc prepare_commit_msg_hook_wait {fd_ph} {
|
|||
set pch_error {}
|
||||
catch {file delete [gitdir PREPARE_COMMIT_MSG]}
|
||||
return
|
||||
}
|
||||
}
|
||||
fconfigure $fd_ph -blocking 0
|
||||
catch {file delete [gitdir PREPARE_COMMIT_MSG]}
|
||||
}
|
||||
|
|
@ -2001,72 +2001,72 @@ set filemask {
|
|||
#define mask_width 14
|
||||
#define mask_height 15
|
||||
static unsigned char mask_bits[] = {
|
||||
0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
|
||||
0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
|
||||
0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
|
||||
0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
|
||||
0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
|
||||
0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
|
||||
}
|
||||
|
||||
image create bitmap file_plain -background white -foreground black -data {
|
||||
#define plain_width 14
|
||||
#define plain_height 15
|
||||
static unsigned char plain_bits[] = {
|
||||
0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
|
||||
0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
|
||||
0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
|
||||
0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
|
||||
0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
|
||||
0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
|
||||
} -maskdata $filemask
|
||||
|
||||
image create bitmap file_mod -background white -foreground blue -data {
|
||||
#define mod_width 14
|
||||
#define mod_height 15
|
||||
static unsigned char mod_bits[] = {
|
||||
0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
|
||||
0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
|
||||
0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
|
||||
0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
|
||||
0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
|
||||
0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
|
||||
} -maskdata $filemask
|
||||
|
||||
image create bitmap file_fulltick -background white -foreground "#007000" -data {
|
||||
#define file_fulltick_width 14
|
||||
#define file_fulltick_height 15
|
||||
static unsigned char file_fulltick_bits[] = {
|
||||
0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
|
||||
0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
|
||||
0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
|
||||
0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
|
||||
0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
|
||||
0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
|
||||
} -maskdata $filemask
|
||||
|
||||
image create bitmap file_question -background white -foreground black -data {
|
||||
#define file_question_width 14
|
||||
#define file_question_height 15
|
||||
static unsigned char file_question_bits[] = {
|
||||
0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
|
||||
0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
|
||||
0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
|
||||
0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
|
||||
0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
|
||||
0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
|
||||
} -maskdata $filemask
|
||||
|
||||
image create bitmap file_removed -background white -foreground red -data {
|
||||
#define file_removed_width 14
|
||||
#define file_removed_height 15
|
||||
static unsigned char file_removed_bits[] = {
|
||||
0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
|
||||
0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
|
||||
0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
|
||||
0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
|
||||
0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
|
||||
0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
|
||||
} -maskdata $filemask
|
||||
|
||||
image create bitmap file_merge -background white -foreground blue -data {
|
||||
#define file_merge_width 14
|
||||
#define file_merge_height 15
|
||||
static unsigned char file_merge_bits[] = {
|
||||
0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
|
||||
0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
|
||||
0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
|
||||
0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
|
||||
0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
|
||||
0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
|
||||
} -maskdata $filemask
|
||||
|
||||
image create bitmap file_statechange -background white -foreground green -data {
|
||||
#define file_statechange_width 14
|
||||
#define file_statechange_height 15
|
||||
static unsigned char file_statechange_bits[] = {
|
||||
0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
|
||||
0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
|
||||
0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
|
||||
0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
|
||||
0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
|
||||
0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
|
||||
} -maskdata $filemask
|
||||
|
||||
set ui_index .vpane.files.index.list
|
||||
|
|
@ -3878,18 +3878,18 @@ proc on_application_mapped {} {
|
|||
set gm $repo_config(gui.geometry)
|
||||
if {$use_ttk} {
|
||||
bind .vpane <Map> \
|
||||
[list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
|
||||
[list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
|
||||
bind .vpane.files <Map> \
|
||||
[list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
|
||||
[list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
|
||||
} else {
|
||||
bind .vpane <Map> \
|
||||
[list on_tk_pane_mapped %W 0 \
|
||||
[lindex $gm 1] \
|
||||
[lindex [.vpane sash coord 0] 1]]
|
||||
[list on_tk_pane_mapped %W 0 \
|
||||
[lindex $gm 1] \
|
||||
[lindex [.vpane sash coord 0] 1]]
|
||||
bind .vpane.files <Map> \
|
||||
[list on_tk_pane_mapped %W 0 \
|
||||
[lindex [.vpane.files sash coord 0] 0] \
|
||||
[lindex $gm 2]]
|
||||
[list on_tk_pane_mapped %W 0 \
|
||||
[lindex [.vpane.files sash coord 0] 0] \
|
||||
[lindex $gm 2]]
|
||||
}
|
||||
wm geometry . [lindex $gm 0]
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue