git-gui: new config to control staging of untracked files
The default is the current "ask". Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>maint
parent
526aa2b203
commit
bb196e2619
|
@ -859,6 +859,7 @@ set font_descs {
|
||||||
{fontui font_ui {mc "Main Font"}}
|
{fontui font_ui {mc "Main Font"}}
|
||||||
{fontdiff font_diff {mc "Diff/Console Font"}}
|
{fontdiff font_diff {mc "Diff/Console Font"}}
|
||||||
}
|
}
|
||||||
|
set default_config(gui.stageuntracked) ask
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
##
|
##
|
||||||
|
|
|
@ -367,7 +367,19 @@ proc do_add_all {} {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if {[llength $untracked_paths]} {
|
if {[llength $untracked_paths]} {
|
||||||
set reply [ask_popup [mc "Stage also untracked files?"]]
|
set reply 0
|
||||||
|
switch -- [get_config gui.stageuntracked] {
|
||||||
|
no {
|
||||||
|
set reply 0
|
||||||
|
}
|
||||||
|
yes {
|
||||||
|
set reply 1
|
||||||
|
}
|
||||||
|
ask -
|
||||||
|
default {
|
||||||
|
set reply [ask_popup [mc "Stage also untracked files?"]]
|
||||||
|
}
|
||||||
|
}
|
||||||
if {$reply} {
|
if {$reply} {
|
||||||
set paths [concat $paths $untracked_paths]
|
set paths [concat $paths $untracked_paths]
|
||||||
}
|
}
|
||||||
|
|
|
@ -156,6 +156,7 @@ proc do_options {} {
|
||||||
{i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
|
{i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
|
||||||
{t gui.newbranchtemplate {mc "New Branch Name Template"}}
|
{t gui.newbranchtemplate {mc "New Branch Name Template"}}
|
||||||
{c gui.encoding {mc "Default File Contents Encoding"}}
|
{c gui.encoding {mc "Default File Contents Encoding"}}
|
||||||
|
{s gui.stageuntracked {mc "Staging of untracked files"} {list "yes" "no" "ask"}}
|
||||||
} {
|
} {
|
||||||
set type [lindex $option 0]
|
set type [lindex $option 0]
|
||||||
set name [lindex $option 1]
|
set name [lindex $option 1]
|
||||||
|
@ -208,6 +209,23 @@ proc do_options {} {
|
||||||
}
|
}
|
||||||
pack $w.$f.$optid -side top -anchor w -fill x
|
pack $w.$f.$optid -side top -anchor w -fill x
|
||||||
}
|
}
|
||||||
|
s {
|
||||||
|
set opts [eval [lindex $option 3]]
|
||||||
|
${NS}::frame $w.$f.$optid
|
||||||
|
${NS}::label $w.$f.$optid.l -text "$text:"
|
||||||
|
if {$use_ttk} {
|
||||||
|
ttk::combobox $w.$f.$optid.v \
|
||||||
|
-textvariable ${f}_config_new($name) \
|
||||||
|
-values $opts -state readonly
|
||||||
|
} else {
|
||||||
|
eval tk_optionMenu $w.$f.$optid.v \
|
||||||
|
${f}_config_new($name) \
|
||||||
|
$opts
|
||||||
|
}
|
||||||
|
pack $w.$f.$optid.l -side left -anchor w -fill x
|
||||||
|
pack $w.$f.$optid.v -side right -anchor e -padx 5
|
||||||
|
pack $w.$f.$optid -side top -anchor w -fill x
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue