Skip to content

Commit

Permalink
gitk: Use the status window for other functions
Browse files Browse the repository at this point in the history
This sets the status window when reading commits, searching through
commits, cherry-picking or checking out a head.

Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Paul Mackerras committed Oct 23, 2007
1 parent a137a90 commit 4570b7e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions gitk
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ proc start_rev_list {view} {
fconfigure $fd -encoding $tclencoding
}
filerun $fd [list getcommitlines $fd $view]
nowbusy $view
nowbusy $view "Reading"
if {$view == $curview} {
set progressdirn 1
set progresscoords {0 0}
Expand Down Expand Up @@ -4264,7 +4264,7 @@ proc dofind {{rev 0}} {
set findstartline $selectedline
}
set findcurline $findstartline
nowbusy finding
nowbusy finding "Searching"
if {$gdttype ne "containing:" && ![info exists filehighlight]} {
after cancel do_file_hl $fh_serial
do_file_hl $fh_serial
Expand Down Expand Up @@ -4303,7 +4303,7 @@ proc findnext {restart} {
} else {
set find_dirn 1
run findmore
nowbusy finding
nowbusy finding "Searching"
}
}

Expand All @@ -4316,7 +4316,7 @@ proc findprev {} {
} else {
set find_dirn -1
run findmorerev
nowbusy finding
nowbusy finding "Searching"
}
}

Expand Down Expand Up @@ -6381,7 +6381,7 @@ proc cherrypick {} {
included in branch $mainhead -- really re-apply it?"]
if {!$ok} return
}
nowbusy cherrypick
nowbusy cherrypick "Cherry-picking"
update
# Unfortunately git-cherry-pick writes stuff to stderr even when
# no error occurs, and exec takes that as an indication of error...
Expand Down Expand Up @@ -6505,7 +6505,7 @@ proc cobranch {} {

# check the tree is clean first??
set oldmainhead $mainhead
nowbusy checkout
nowbusy checkout "Checking out"
update
dohidelocalchanges
if {[catch {
Expand Down

0 comments on commit 4570b7e

Please sign in to comment.