Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui: (28 commits) git-gui 0.16 git-gui: handle shell script text filters when loading for blame. git-gui: Set both 16x16 and 32x32 icons on X to pacify Xming. git-gui: added config gui.gcwarning to disable the gc hint message git-gui: set whitespace warnings appropriate to this project git-gui: don't warn for detached head when rebasing git-gui: make config gui.warndetachedcommit a boolean git-gui: add config value gui.diffopts for passing additional diff options git-gui: sort the numeric ansi codes git-gui: support underline style when parsing diff output git-gui: fix spelling error in sshkey.tcl git-gui: include the file path in guitools confirmation dialog git-gui: span widgets over the full file output area in the blame view git-gui: use a tristate to control the case mode in the searchbar git-gui: set suitable extended window manager hints. git-gui: fix display of path in browser title git-gui: enable the smart case sensitive search only if gui.search.smartcase is true git-gui: catch invalid or complete regular expressions and treat as no match. git-gui: theme the search and line-number entry fields on blame screen git-gui: include the number of untracked files to stage when asking the user ...
This commit is contained in:
@ -356,21 +356,33 @@ proc do_add_all {} {
|
||||
global file_states
|
||||
|
||||
set paths [list]
|
||||
set unknown_paths [list]
|
||||
set untracked_paths [list]
|
||||
foreach path [array names file_states] {
|
||||
switch -glob -- [lindex $file_states($path) 0] {
|
||||
U? {continue}
|
||||
?M -
|
||||
?T -
|
||||
?D {lappend paths $path}
|
||||
?O {lappend unknown_paths $path}
|
||||
?O {lappend untracked_paths $path}
|
||||
}
|
||||
}
|
||||
if {[llength $unknown_paths]} {
|
||||
set reply [ask_popup [mc "There are unknown files do you also want
|
||||
to stage those?"]]
|
||||
if {[llength $untracked_paths]} {
|
||||
set reply 0
|
||||
switch -- [get_config gui.stageuntracked] {
|
||||
no {
|
||||
set reply 0
|
||||
}
|
||||
yes {
|
||||
set reply 1
|
||||
}
|
||||
ask -
|
||||
default {
|
||||
set reply [ask_popup [mc "Stage %d untracked files?" \
|
||||
[llength $untracked_paths]]]
|
||||
}
|
||||
}
|
||||
if {$reply} {
|
||||
set paths [concat $paths $unknown_paths]
|
||||
set paths [concat $paths $untracked_paths]
|
||||
}
|
||||
}
|
||||
add_helper {Adding all changed files} $paths
|
||||
|
Reference in New Issue
Block a user