-
Notifications
You must be signed in to change notification settings - Fork 127
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
git-gui: revert untracked files by deleting them #436
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,8 +30,8 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.}] | |
## | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. On the Git mailing list, Pratyush Yadav wrote (reply to this):
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. On the Git mailing list, Pratyush Yadav wrote (reply to this):
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. On the Git mailing list, Pratyush Yadav wrote (reply to this):
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. On the Git mailing list, Jonathan Gilbert wrote (reply to this):
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. On the Git mailing list, Philip Oakley wrote (reply to this):
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. On the Git mailing list, Jonathan Gilbert wrote (reply to this):
|
||
## Tcl/Tk sanity check | ||
|
||
if {[catch {package require Tcl 8.4} err] | ||
|| [catch {package require Tk 8.4} err] | ||
if {[catch {package require Tcl 8.6} err] | ||
|| [catch {package require Tk 8.6} err] | ||
} { | ||
catch {wm withdraw .} | ||
tk_messageBox \ | ||
|
@@ -1797,10 +1797,10 @@ proc ui_status {msg} { | |
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. On the Git mailing list, Pratyush Yadav wrote (reply to this):
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. On the Git mailing list, Jonathan Gilbert wrote (reply to this):
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. On the Git mailing list, Benjamin Poirier wrote (reply to this):
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. On the Git mailing list, Pratyush Yadav wrote (reply to this):
|
||
} | ||
|
||
proc ui_ready {{test {}}} { | ||
proc ui_ready {} { | ||
global main_status | ||
if {[info exists main_status]} { | ||
$main_status show [mc "Ready."] $test | ||
$main_status show [mc "Ready."] | ||
} | ||
} | ||
|
||
|
@@ -2150,8 +2150,6 @@ proc incr_font_size {font {amt 1}} { | |
## | ||
## ui commands | ||
|
||
set starting_gitk_msg [mc "Starting gitk... please wait..."] | ||
|
||
proc do_gitk {revs {is_submodule false}} { | ||
global current_diff_path file_states current_diff_side ui_index | ||
global _gitdir _gitworktree | ||
|
@@ -2206,10 +2204,11 @@ proc do_gitk {revs {is_submodule false}} { | |
set env(GIT_WORK_TREE) $_gitworktree | ||
cd $pwd | ||
|
||
ui_status $::starting_gitk_msg | ||
after 10000 { | ||
ui_ready $starting_gitk_msg | ||
} | ||
set status_operation [$::main_status \ | ||
start \ | ||
[mc "Starting %s... please wait..." "gitk"]] | ||
|
||
after 3500 [list $status_operation stop] | ||
} | ||
} | ||
|
||
|
@@ -2240,10 +2239,11 @@ proc do_git_gui {} { | |
set env(GIT_WORK_TREE) $_gitworktree | ||
cd $pwd | ||
|
||
ui_status $::starting_gitk_msg | ||
after 10000 { | ||
ui_ready $starting_gitk_msg | ||
} | ||
set status_operation [$::main_status \ | ||
start \ | ||
[mc "Starting %s... please wait..." "git-gui"]] | ||
|
||
after 3500 [list $status_operation stop] | ||
} | ||
} | ||
|
||
|
@@ -4159,6 +4159,9 @@ if {$picked && [is_config_true gui.autoexplore]} { | |
do_explore | ||
} | ||
|
||
# Clear "Initializing..." status | ||
after 500 {$main_status show ""} | ||
|
||
# Local variables: | ||
# mode: tcl | ||
# indent-tabs-mode: t | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On the Git mailing list, Pratyush Yadav wrote (reply to this):
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On the Git mailing list, Jonathan Gilbert wrote (reply to this):