@matheusbsbs / matheus-bagliano / commits / 19e283f5c2
Fork 0

git-gui: Don't offer tracking branches if none exist.

I refactored the common code related to tracking branch listing into a new procedure all_tracking_branches. This saves a few lines and should make the create and delete dialogs easier to maintain. We now don't offer a radio button to create from a tracking branch or merge-check a tracking branch if there are no tracking branches known to git-gui. This prevents us from creating an empty option list and letting the user try to shoot themselves in the foot by asking us to work against an empty initial revision. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed Jan 21, 2007 at 15:38 UTC 19e283f5c25b64a55fca099342f9bebddef4e17e
1 file changed +38 -39
git-gui.sh
+38 -39
@@ -1679,6 +1679,17 @@ proc populate_branch_menu {} {
1679 }
1680 }
1681
1682 +proc all_tracking_branches {} {
1683 + global tracking_branches
1684 +
1685 + set all_trackings [list]
1686 + foreach b [array names tracking_branches] {
1687 + regsub ^refs/(heads|remotes)/ $b {} b
1688 + lappend all_trackings $b
1689 + }
1690 + return [lsort -unique $all_trackings]
1691 +}
1692 +
1693 proc do_create_branch_action {w} {
1694 global all_heads null_sha1
1695 global create_branch_checkout create_branch_revtype
@@ -1747,7 +1758,7 @@ proc do_create_branch_action {w} {
1758 }
1759
1760 proc do_create_branch {} {
1750 - global all_heads current_branch tracking_branches
1761 + global all_heads current_branch
1762 global create_branch_checkout create_branch_revtype
1763 global create_branch_head create_branch_trackinghead
1764
@@ -1802,16 +1813,6 @@ proc do_create_branch {} {
1813 grid columnconfigure $w.desc 1 -weight 1
1814 pack $w.desc -anchor nw -fill x -pady 5 -padx 5
1815
1805 - set all_trackings [list]
1806 - foreach b [array names tracking_branches] {
1807 - regsub ^refs/(heads|remotes)/ $b {} b
1808 - lappend all_trackings $b
1809 - }
1810 - set all_trackings [lsort -unique $all_trackings]
1811 - if {$all_trackings ne {}} {
1812 - set create_branch_trackinghead [lindex $all_trackings 0]
1813 - }
1814 -
1816 labelframe $w.from \
1817 -text {Starting Revision} \
1818 -font font_ui
@@ -1822,15 +1823,19 @@ proc do_create_branch {} {
1823 -font font_ui
1824 eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
1825 grid $w.from.head_r $w.from.head_m -sticky w
1825 - radiobutton $w.from.tracking_r \
1826 - -text {Tracking Branch:} \
1827 - -value tracking \
1828 - -variable create_branch_revtype \
1829 - -font font_ui
1830 - eval tk_optionMenu $w.from.tracking_m \
1831 - create_branch_trackinghead \
1832 - $all_trackings
1833 - grid $w.from.tracking_r $w.from.tracking_m -sticky w
1826 + set all_trackings [all_tracking_branches]
1827 + if {$all_trackings ne {}} {
1828 + set create_branch_trackinghead [lindex $all_trackings 0]
1829 + radiobutton $w.from.tracking_r \
1830 + -text {Tracking Branch:} \
1831 + -value tracking \
1832 + -variable create_branch_revtype \
1833 + -font font_ui
1834 + eval tk_optionMenu $w.from.tracking_m \
1835 + create_branch_trackinghead \
1836 + $all_trackings
1837 + grid $w.from.tracking_r $w.from.tracking_m -sticky w
1838 + }
1839 radiobutton $w.from.exp_r \
1840 -text {Revision Expression:} \
1841 -value expression \
@@ -2000,16 +2005,6 @@ proc do_delete_branch {} {
2005 pack $w.list.l -fill both -pady 5 -padx 5
2006 pack $w.list -fill both -pady 5 -padx 5
2007
2003 - set all_trackings [list]
2004 - foreach b [array names tracking_branches] {
2005 - regsub ^refs/(heads|remotes)/ $b {} b
2006 - lappend all_trackings $b
2007 - }
2008 - set all_trackings [lsort -unique $all_trackings]
2009 - if {$all_trackings ne {} && $delete_branch_trackinghead eq {}} {
2010 - set delete_branch_trackinghead [lindex $all_trackings 0]
2011 - }
2012 -
2008 labelframe $w.validate \
2009 -text {Delete Only If} \
2010 -font font_ui
@@ -2020,15 +2015,19 @@ proc do_delete_branch {} {
2015 -font font_ui
2016 eval tk_optionMenu $w.validate.head_m delete_branch_head $all_heads
2017 grid $w.validate.head_r $w.validate.head_m -sticky w
2023 - radiobutton $w.validate.tracking_r \
2024 - -text {Merged Into Tracking Branch:} \
2025 - -value tracking \
2026 - -variable delete_branch_checktype \
2027 - -font font_ui
2028 - eval tk_optionMenu $w.validate.tracking_m \
2029 - delete_branch_trackinghead \
2030 - $all_trackings
2031 - grid $w.validate.tracking_r $w.validate.tracking_m -sticky w
2018 + set all_trackings [all_tracking_branches]
2019 + if {$all_trackings ne {}} {
2020 + set delete_branch_trackinghead [lindex $all_trackings 0]
2021 + radiobutton $w.validate.tracking_r \
2022 + -text {Merged Into Tracking Branch:} \
2023 + -value tracking \
2024 + -variable delete_branch_checktype \
2025 + -font font_ui
2026 + eval tk_optionMenu $w.validate.tracking_m \
2027 + delete_branch_trackinghead \
2028 + $all_trackings
2029 + grid $w.validate.tracking_r $w.validate.tracking_m -sticky w
2030 + }
2031 radiobutton $w.validate.always_r \
2032 -text {Always (Do not perform merge checks)} \
2033 -value always \