1 # git-gui branch create support
2 # Copyright (C) 2006, 2007 Shawn Pearce
6 field w
; # widget path
7 field w_rev
; # mega-widget to pick the initial revision
8 field w_name
; # new branch name widget
10 field name
{}; # name of the branch the user has chosen
11 field name_type user
; # type of branch name to use
13 field opt_merge ff
; # type of merge to apply to existing branch
14 field opt_checkout
1; # automatically checkout the new branch?
15 field opt_fetch
1; # refetch tracking branch if used?
16 field reset_ok
0; # did the user agree to reset?
18 constructor dialog
{} {
22 wm title
$top "[appname] ([reponame]): Create Branch"
24 wm geometry
$top "+[winfo rootx .]+[winfo rooty .]"
27 label $w.header
-text {Create New Branch
} -font font_uibold
28 pack $w.header
-side top
-fill x
31 button $w.buttons.create
-text Create
\
34 pack $w.buttons.create
-side right
35 button $w.buttons.cancel
-text {Cancel
} \
36 -command [list destroy $w]
37 pack $w.buttons.cancel
-side right
-padx 5
38 pack $w.buttons
-side bottom
-fill x
-pady 10 -padx 10
40 labelframe $w.desc
-text {Branch Name
}
41 radiobutton $w.desc.name_r
\
46 set w_name
$w.desc.name_t
53 -validatecommand [cb _validate
%d
%S
]
54 grid $w.desc.name_r
$w_name -sticky we
-padx {0 5}
56 radiobutton $w.desc.match_r
\
58 -text {Match Tracking Branch Name
} \
61 grid $w.desc.match_r
-sticky we
-padx {0 5} -columnspan 2
63 grid columnconfigure
$w.desc
1 -weight 1
64 pack $w.desc
-anchor nw
-fill x
-pady 5 -padx 5
66 set w_rev
[::choose_rev::new $w.rev
{Starting Revision
}]
67 pack $w.rev
-anchor nw
-fill both
-expand 1 -pady 5 -padx 5
69 labelframe $w.
options -text {Options
}
71 frame $w.
options.merge
72 label $w.
options.merge.l
-text {Update Existing Branch
:}
73 pack $w.
options.merge.l
-side left
74 radiobutton $w.
options.merge.no
\
78 pack $w.
options.merge.no
-side left
79 radiobutton $w.
options.merge.ff
\
80 -text {Fast Forward Only
} \
83 pack $w.
options.merge.ff
-side left
84 radiobutton $w.
options.merge.reset
\
88 pack $w.
options.merge.reset
-side left
89 pack $w.
options.merge
-anchor nw
91 checkbutton $w.
options.fetch
\
92 -text {Fetch Tracking Branch
} \
94 pack $w.
options.fetch
-anchor nw
96 checkbutton $w.
options.checkout
\
97 -text {Checkout After Creation
} \
98 -variable @opt_checkout
99 pack $w.
options.checkout
-anchor nw
100 pack $w.
options -anchor nw
-fill x
-pady 5 -padx 5
102 trace add
variable @name_type write
[cb _select
]
104 set name
$repo_config(gui.newbranchtemplate
)
105 if {[is_config_true gui.matchtrackingbranch
]} {
109 bind $w <Visibility
> [cb _visible
]
110 bind $w <Key-Escape
> [list destroy $w]
111 bind $w <Key-Return
> [cb _create
]\;break
119 set spec
[$w_rev get_tracking_branch
]
120 switch -- $name_type {
129 -title [wm title
$w] \
131 -message "Please select a tracking branch."
134 if {![regsub ^refs
/heads
/ [lindex $spec 2] {} newbranch
]} {
138 -title [wm title
$w] \
140 -message "Tracking branch [$w get] is not a branch in the remote repository."
147 ||
$newbranch eq
$repo_config(gui.newbranchtemplate
)} {
151 -title [wm title
$w] \
153 -message "Please supply a branch name."
158 if {[catch {git check-ref-format
"heads/$newbranch"}]} {
162 -title [wm title
$w] \
164 -message "'$newbranch' is not an acceptable branch name."
169 if {$spec ne
{} && $opt_fetch} {
171 } elseif
{[catch {set new
[$w_rev commit_or_die
]}]} {
175 set co
[::checkout_op::new \
178 refs
/heads
/$newbranch]
181 $co enable_merge
$opt_merge
182 $co enable_checkout
$opt_checkout
183 if {$spec ne
{} && $opt_fetch} {
184 $co enable_fetch
$spec
194 method _validate
{d S
} {
196 if {[regexp {[~^
:?
*\[\0- ]} $S]} {
199 if {[string length
$S] > 0} {
206 method _select
{args
} {
207 if {$name_type eq
{match
}} {
208 $w_rev pick_tracking_branch
214 if {$name_type eq
{user
}} {