git-gui: Fix gitk for branch whose name matches local file
[git/raj.git] / lib / branch_create.tcl
blob3817771b944cc363205b86c91f7b4801c1d568f9
1 # git-gui branch create support
2 # Copyright (C) 2006, 2007 Shawn Pearce
4 class branch_create {
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 {} {
19 global repo_config
21 make_toplevel top w
22 wm title $top [append "[appname] ([reponame]): " [mc "Create Branch"]]
23 if {$top ne {.}} {
24 wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
27 label $w.header -text [mc "Create New Branch"] -font font_uibold
28 pack $w.header -side top -fill x
30 frame $w.buttons
31 button $w.buttons.create -text [mc Create] \
32 -default active \
33 -command [cb _create]
34 pack $w.buttons.create -side right
35 button $w.buttons.cancel -text [mc 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 [mc "Branch Name"]
41 radiobutton $w.desc.name_r \
42 -anchor w \
43 -text [mc "Name:"] \
44 -value user \
45 -variable @name_type
46 set w_name $w.desc.name_t
47 entry $w_name \
48 -borderwidth 1 \
49 -relief sunken \
50 -width 40 \
51 -textvariable @name \
52 -validate key \
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 \
57 -anchor w \
58 -text [mc "Match Tracking Branch Name"] \
59 -value match \
60 -variable @name_type
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 [mc "Starting Revision"]]
67 pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5
69 labelframe $w.options -text [mc Options]
71 frame $w.options.merge
72 label $w.options.merge.l -text [mc "Update Existing Branch:"]
73 pack $w.options.merge.l -side left
74 radiobutton $w.options.merge.no \
75 -text [mc No] \
76 -value none \
77 -variable @opt_merge
78 pack $w.options.merge.no -side left
79 radiobutton $w.options.merge.ff \
80 -text [mc "Fast Forward Only"] \
81 -value ff \
82 -variable @opt_merge
83 pack $w.options.merge.ff -side left
84 radiobutton $w.options.merge.reset \
85 -text [mc Reset] \
86 -value reset \
87 -variable @opt_merge
88 pack $w.options.merge.reset -side left
89 pack $w.options.merge -anchor nw
91 checkbutton $w.options.fetch \
92 -text [mc "Fetch Tracking Branch"] \
93 -variable @opt_fetch
94 pack $w.options.fetch -anchor nw
96 checkbutton $w.options.checkout \
97 -text [mc "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]} {
106 set name_type match
109 bind $w <Visibility> [cb _visible]
110 bind $w <Key-Escape> [list destroy $w]
111 bind $w <Key-Return> [cb _create]\;break
112 tkwait window $w
115 method _create {} {
116 global repo_config
117 global M1B
119 set spec [$w_rev get_tracking_branch]
120 switch -- $name_type {
121 user {
122 set newbranch $name
124 match {
125 if {$spec eq {}} {
126 tk_messageBox \
127 -icon error \
128 -type ok \
129 -title [wm title $w] \
130 -parent $w \
131 -message [mc "Please select a tracking branch."]
132 return
134 if {![regsub ^refs/heads/ [lindex $spec 2] {} newbranch]} {
135 tk_messageBox \
136 -icon error \
137 -type ok \
138 -title [wm title $w] \
139 -parent $w \
140 -message [mc "Tracking branch %s is not a branch in the remote repository." [$w get]]
141 return
146 if {$newbranch eq {}
147 || $newbranch eq $repo_config(gui.newbranchtemplate)} {
148 tk_messageBox \
149 -icon error \
150 -type ok \
151 -title [wm title $w] \
152 -parent $w \
153 -message [mc "Please supply a branch name."]
154 focus $w_name
155 return
158 if {[catch {git check-ref-format "heads/$newbranch"}]} {
159 tk_messageBox \
160 -icon error \
161 -type ok \
162 -title [wm title $w] \
163 -parent $w \
164 -message [mc "'%s' is not an acceptable branch name." $newbranch]
165 focus $w_name
166 return
169 if {$spec ne {} && $opt_fetch} {
170 set new {}
171 } elseif {[catch {set new [$w_rev commit_or_die]}]} {
172 return
175 set co [::checkout_op::new \
176 [$w_rev get] \
177 $new \
178 refs/heads/$newbranch]
179 $co parent $w
180 $co enable_create 1
181 $co enable_merge $opt_merge
182 $co enable_checkout $opt_checkout
183 if {$spec ne {} && $opt_fetch} {
184 $co enable_fetch $spec
186 if {$spec ne {}} {
187 $co remote_source $spec
190 if {[$co run]} {
191 destroy $w
192 } else {
193 focus $w_name
197 method _validate {d S} {
198 if {$d == 1} {
199 if {[regexp {[~^:?*\[\0- ]} $S]} {
200 return 0
202 if {[string length $S] > 0} {
203 set name_type user
206 return 1
209 method _select {args} {
210 if {$name_type eq {match}} {
211 $w_rev pick_tracking_branch
215 method _visible {} {
216 grab $w
217 if {$name_type eq {user}} {
218 $w_name icursor end
219 focus $w_name