git-gui: Separate transport/branch menus from multicommit.
These are now controlled by the transport and branch options, rather than the multicommit option. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Feb 8, 2007 at 18:10 UTC
64a906f8611ee195efcde76f5587c8e08bac7a25
1 file changed
+12
-7
git-gui.sh
+12
-7
@@ -320,8 +320,13 @@ set _reponame [lindex [file split \
320
end]
321
322
enable_option multicommit
323
+enable_option branch
324
+enable_option transport
325
+
326
if {[appname] eq {git-citool}} {
327
disable_option multicommit
328
+ disable_option branch
329
+ disable_option transport
330
}
331
332
######################################################################
@@ -443,7 +448,7 @@ proc rescan {after {honor_trustmtime 1}} {
448
$ui_comm edit modified false
449
}
450
446
- if {[is_enabled multicommit]} {
451
+ if {[is_enabled branch]} {
452
load_all_heads
453
populate_branch_menu
454
}
@@ -4918,11 +4923,11 @@ apply_config
4923
menu .mbar -tearoff 0
4924
.mbar add cascade -label Repository -menu .mbar.repository
4925
.mbar add cascade -label Edit -menu .mbar.edit
4921
-if {[is_enabled multicommit]} {
4926
+if {[is_enabled branch]} {
4927
.mbar add cascade -label Branch -menu .mbar.branch
4928
}
4929
.mbar add cascade -label Commit -menu .mbar.commit
4925
-if {[is_enabled multicommit]} {
4930
+if {[is_enabled transport]} {
4931
.mbar add cascade -label Merge -menu .mbar.merge
4932
.mbar add cascade -label Fetch -menu .mbar.fetch
4933
.mbar add cascade -label Push -menu .mbar.push
@@ -5023,7 +5028,7 @@ menu .mbar.edit
5028
5029
# -- Branch Menu
5030
#
5026
-if {[is_enabled multicommit]} {
5031
+if {[is_enabled branch]} {
5032
menu .mbar.branch
5033
5034
.mbar.branch add command -label {Create...} \
@@ -5230,7 +5235,7 @@ pack .branch.l1 -side left
5235
pack .branch.cb -side left -fill x
5236
pack .branch -side top -fill x
5237
5233
-if {[is_enabled multicommit]} {
5238
+if {[is_enabled branch]} {
5239
menu .mbar.merge
5240
.mbar.merge add command -label {Local Merge...} \
5241
-command do_local_merge \
@@ -5702,7 +5707,7 @@ bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
5707
bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
5708
bind $ui_diff <Button-1> {focus %W}
5709
5705
-if {[is_enabled multicommit]} {
5710
+if {[is_enabled branch]} {
5711
bind . <$M1B-Key-n> do_create_branch
5712
bind . <$M1B-Key-N> do_create_branch
5713
}
@@ -5799,7 +5804,7 @@ user.email settings into your personal
5804
5805
# -- Only initialize complex UI if we are going to stay running.
5806
#
5802
-if {[is_enabled multicommit]} {
5807
+if {[is_enabled transport]} {
5808
load_all_remotes
5809
load_all_heads
5810