1 # git-gui branch merge support
2 # Copyright (C) 2006, 2007 Shawn Pearce
7 global HEAD commit_type file_states
9 if {[string match amend* $commit_type]} {
10 info_popup {Cannot merge while amending.
12 You must finish amending this commit before starting any type of merge.
17 if {[committer_ident] eq {}} {return 0}
18 if {![lock_index merge]} {return 0}
20 # -- Our in memory state should match the repository.
22 repository_state curType curHEAD curMERGE_HEAD
23 if {$commit_type ne $curType || $HEAD ne $curHEAD} {
24 info_popup {Last scanned state does not match repository state.
26 Another Git program has modified this repository since the last scan. A rescan must be performed before a merge can be performed.
28 The rescan will be automatically started now.
31 rescan {set ui_status_value {Ready.}}
35 foreach path [array names file_states] {
36 switch -glob -- [lindex $file_states($path) 0] {
38 continue; # and pray it works!
41 error_popup "You are in the middle of a conflicted merge.
43 File [short_path $path] has merge conflicts.
45 You must resolve them, add the file, and commit to complete the current merge. Only then can you begin another merge.
51 error_popup "You are in the middle of a change.
53 File [short_path $path] is modified.
55 You should complete the current commit before starting a merge. Doing so will help you abort a failed merge, should the need arise.
68 foreach i [$w.source.l curselection] {
69 lappend r [lindex [lindex $list $i] 0]
74 proc _visualize {w list} {
75 set revs [_refs $w $list]
76 if {$revs eq {}} return
77 lappend revs --not HEAD
81 proc _start {w list} {
82 global HEAD ui_status_value current_branch
84 set cmd [list git merge]
85 set names [_refs $w $list]
86 set revcnt [llength $names]
91 } elseif {$revcnt == 1} {
93 } elseif {$revcnt <= 15} {
99 "Use octopus merge strategy?
101 You are merging $revcnt branches at once. This requires using the octopus merge driver, which may not succeed if there are file-level conflicts.
112 -title [wm title $w] \
114 -message "Too many branches selected.
116 You have requested to merge $revcnt branches in an octopus merge. This exceeds Git's internal limit of 15 branches per merge.
118 Please select fewer branches. To merge more than 15 branches, merge the branches in batches.
123 set msg "Merging $current_branch, [join $names {, }]"
124 set ui_status_value "$msg..."
125 set cons [console::new "Merge" $msg]
126 console::exec $cons $cmd [namespace code [list _finish $revcnt]]
131 proc _finish {revcnt w ok} {
134 set msg {Merge completed successfully.}
137 info_popup "Octopus merge failed.
139 Your merge of $revcnt branches has failed.
141 There are file-level conflicts between the branches which must be resolved manually.
143 The working directory will now be reset.
145 You can attempt this merge again by merging only one branch at a time." $w
147 set fd [open "| git read-tree --reset -u HEAD" r]
148 fconfigure $fd -blocking 0 -translation binary
149 fileevent $fd readable \
150 [namespace code [list _reset_wait $fd]]
151 set ui_status_value {Aborting... please wait...}
155 set msg {Merge failed. Conflict resolution is required.}
158 rescan [list set ui_status_value $msg]
162 global current_branch
165 if {![_can_merge]} return
167 set fmt {list %(objectname) %(*objectname) %(refname) %(subject)}
168 set cmd [list git for-each-ref --tcl --format=$fmt]
169 lappend cmd refs/heads
170 lappend cmd refs/remotes
171 lappend cmd refs/tags
172 set fr_fd [open "| $cmd" r]
173 fconfigure $fr_fd -translation binary
174 while {[gets $fr_fd line] > 0} {
175 set line [eval $line]
176 set ref [lindex $line 2]
177 regsub ^refs/(heads|remotes|tags)/ $ref {} ref
178 set subj($ref) [lindex $line 3]
179 lappend sha1([lindex $line 0]) $ref
180 if {[lindex $line 1] ne {}} {
181 lappend sha1([lindex $line 1]) $ref
187 set fr_fd [open "| git rev-list --all --not HEAD"]
188 while {[gets $fr_fd line] > 0} {
189 if {[catch {set ref $sha1($line)}]} continue
191 lappend to_show [list $n $line]
195 set to_show [lsort -unique $to_show]
199 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
201 set _visualize [namespace code [list _visualize $w $to_show]]
202 set _start [namespace code [list _start $w $to_show]]
205 -text "Merge Into $current_branch" \
207 pack $w.header -side top -fill x
210 button $w.buttons.visualize -text Visualize -command $_visualize
211 pack $w.buttons.visualize -side left
212 button $w.buttons.create -text Merge -command $_start
213 pack $w.buttons.create -side right
214 button $w.buttons.cancel -text {Cancel} -command [list destroy $w]
215 pack $w.buttons.cancel -side right -padx 5
216 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
218 labelframe $w.source -text {Source Branches}
219 listbox $w.source.l \
223 -selectmode extended \
224 -yscrollcommand [list $w.source.sby set]
225 scrollbar $w.source.sby -command [list $w.source.l yview]
226 pack $w.source.sby -side right -fill y
227 pack $w.source.l -side left -fill both -expand 1
228 pack $w.source -fill both -expand 1 -pady 5 -padx 5
230 foreach ref $to_show {
231 set n [lindex $ref 0]
232 if {[string length $n] > 20} {
233 set n "[string range $n 0 16]..."
235 $w.source.l insert end [format {%s %-20s %s} \
236 [string range [lindex $ref 1] 0 5] \
238 $subj([lindex $ref 0])]
241 bind $w.source.l <Key-K> [list event generate %W <Shift-Key-Up>]
242 bind $w.source.l <Key-J> [list event generate %W <Shift-Key-Down>]
243 bind $w.source.l <Key-k> [list event generate %W <Key-Up>]
244 bind $w.source.l <Key-j> [list event generate %W <Key-Down>]
245 bind $w.source.l <Key-h> [list event generate %W <Key-Left>]
246 bind $w.source.l <Key-l> [list event generate %W <Key-Right>]
247 bind $w.source.l <Key-v> $_visualize
249 bind $w <$M1B-Key-Return> $_start
250 bind $w <Visibility> "grab $w; focus $w.source.l"
251 bind $w <Key-Escape> "unlock_index;destroy $w"
252 bind $w <Destroy> unlock_index
253 wm title $w "[appname] ([reponame]): Merge"
258 global HEAD commit_type file_states
260 if {[string match amend* $commit_type]} {
261 info_popup {Cannot abort while amending.
263 You must finish amending this commit.
268 if {![lock_index abort]} return
270 if {[string match *merge* $commit_type]} {
276 if {[ask_popup "Abort $op?
278 Aborting the current $op will cause *ALL* uncommitted changes to be lost.
280 Continue with aborting the current $op?"] eq {yes}} {
281 set fd [open "| git read-tree --reset -u HEAD" r]
282 fconfigure $fd -blocking 0 -translation binary
283 fileevent $fd readable [namespace code [list _reset_wait $fd]]
284 set ui_status_value {Aborting... please wait...}
290 proc _reset_wait {fd} {
298 $ui_comm delete 0.0 end
299 $ui_comm edit modified false
301 catch {file delete [gitdir MERGE_HEAD]}
302 catch {file delete [gitdir rr-cache MERGE_RR]}
303 catch {file delete [gitdir SQUASH_MSG]}
304 catch {file delete [gitdir MERGE_MSG]}
305 catch {file delete [gitdir GITGUI_MSG]}
307 rescan {set ui_status_value {Abort completed. Ready.}}