mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-01 06:47:52 +01:00
Code Activity

Merge branch 'maint'

Browse source 
* maint:
  git-gui: Ensure windows shortcuts always have .bat extension
  git-gui: Include a Push action on the left toolbar
  git-gui: Bind M1-P to push action
  git-gui: Don't bind F5/M1-R in all windows

Conflicts:

	git-gui.sh
This commit is contained in:
Shawn O. Pearce 2007-07-06 04:03:24 -04:00
commit f8186e92e3
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
git-gui.sh
View file

@ -1559,7 +1559,8 @@ if {[is_enabled transport]} {
menu .mbar.push menu .mbar.push
.mbar.push add command -label {Push...} \ .mbar.push add command -label {Push...} \
-command do_push_anywhere -command do_push_anywhere \
-accelerator $M1T-P
.mbar.push add command -label {Delete...} \ .mbar.push add command -label {Delete...} \
-command remote_branch_delete::dialog -command remote_branch_delete::dialog
} }
@ -1849,6 +1850,10 @@ pack .vpane.lower.commarea.buttons.commit -side top -fill x
lappend disable_on_lock \ lappend disable_on_lock \
{.vpane.lower.commarea.buttons.commit conf -state} {.vpane.lower.commarea.buttons.commit conf -state}
button .vpane.lower.commarea.buttons.push -text {Push} \
-command do_push_anywhere
pack .vpane.lower.commarea.buttons.push -side top -fill x
# -- Commit Message Buffer # -- Commit Message Buffer
# #
frame .vpane.lower.commarea.buffer frame .vpane.lower.commarea.buffer
@ -2176,10 +2181,14 @@ if {[is_enabled branch]} {
bind . <$M1B-Key-n> do_create_branch bind . <$M1B-Key-n> do_create_branch
bind . <$M1B-Key-N> do_create_branch bind . <$M1B-Key-N> do_create_branch
} }
if {[is_enabled transport]} {
bind . <$M1B-Key-p> do_push_anywhere
bind . <$M1B-Key-P> do_push_anywhere
}
bind all <Key-F5> do_rescan bind . <Key-F5> do_rescan
bind all <$M1B-Key-r> do_rescan bind . <$M1B-Key-r> do_rescan
bind all <$M1B-Key-R> do_rescan bind . <$M1B-Key-R> do_rescan
bind . <$M1B-Key-s> do_signoff bind . <$M1B-Key-s> do_signoff
bind . <$M1B-Key-S> do_signoff bind . <$M1B-Key-S> do_signoff
bind . <$M1B-Key-i> do_add_all bind . <$M1B-Key-i> do_add_all

6
lib/shortcut.tcl
View file

@ -9,6 +9,9 @@ proc do_windows_shortcut {} {
-title "[appname] ([reponame]): Create Desktop Icon" \ -title "[appname] ([reponame]): Create Desktop Icon" \
-initialfile "Git [reponame].bat"] -initialfile "Git [reponame].bat"]
if {$fn != {}} { if {$fn != {}} {
if {[file extension $fn] ne {.bat}} {
set fn ${fn}.bat
}
if {[catch { if {[catch {
set fd [open $fn w] set fd [open $fn w]
puts $fd "@ECHO Entering [reponame]" puts $fd "@ECHO Entering [reponame]"
@ -42,6 +45,9 @@ proc do_cygwin_shortcut {} {
-initialdir $desktop \ -initialdir $desktop \
-initialfile "Git [reponame].bat"] -initialfile "Git [reponame].bat"]
if {$fn != {}} { if {$fn != {}} {
if {[file extension $fn] ne {.bat}} {
set fn ${fn}.bat
}
if {[catch { if {[catch {
set fd [open $fn w] set fd [open $fn w]
set sh [exec cygpath \ set sh [exec cygpath \