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 revs
[$w.
source.l get
$i]
71 if {$revs eq
{}} return
72 lappend revs
--not HEAD
77 global HEAD ui_status_value current_branch
79 set cmd
[list git merge
]
82 foreach i
[$w.
source.l curselection
] {
83 set b
[$w.
source.l get
$i]
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
164 if {![_can_merge
]} return
168 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
171 -text "Merge Into $current_branch" \
173 pack $w.header
-side top
-fill x
176 button $w.buttons.visualize
-text Visualize
\
177 -command [namespace code
[list _visualize
$w]]
178 pack $w.buttons.visualize
-side left
179 button $w.buttons.create
-text Merge
\
180 -command [namespace code
[list _start
$w]]
181 pack $w.buttons.create
-side right
182 button $w.buttons.cancel
-text {Cancel
} \
183 -command [list destroy $w]
184 pack $w.buttons.cancel
-side right
-padx 5
185 pack $w.buttons
-side bottom
-fill x
-pady 10 -padx 10
187 labelframe $w.
source -text {Source Branches
}
188 listbox $w.
source.l
\
191 -selectmode extended
\
192 -yscrollcommand [list $w.
source.sby
set]
193 scrollbar $w.
source.sby
-command [list $w.
source.l yview
]
194 pack $w.
source.sby
-side right
-fill y
195 pack $w.
source.l
-side left
-fill both
-expand 1
196 pack $w.
source -fill both
-expand 1 -pady 5 -padx 5
198 set fmt
{list %(objectname
) %(*objectname
) %(refname
) %(subject
)}
199 set cmd
[list git for-each-ref
--tcl --format=$fmt]
200 lappend cmd refs
/heads
201 lappend cmd refs
/remotes
202 lappend cmd refs
/tags
203 set fr_fd
[open "| $cmd" r
]
204 fconfigure $fr_fd -translation binary
205 while {[gets $fr_fd line
] > 0} {
206 set line
[eval $line]
207 set ref
[lindex $line 2]
208 regsub ^refs
/(heads|remotes|tags
)/ $ref {} ref
209 set subj
($ref) [lindex $line 3]
210 lappend sha1
([lindex $line 0]) $ref
211 if {[lindex $line 1] ne
{}} {
212 lappend sha1
([lindex $line 1]) $ref
218 set fr_fd
[open "| git rev-list --all --not HEAD"]
219 while {[gets $fr_fd line
] > 0} {
220 if {[catch {set ref
$sha1($line)}]} continue
227 foreach ref
[lsort -unique $to_show] {
228 $w.
source.l insert end
$ref
231 bind $w <Visibility
> "grab $w"
232 bind $w <Key-Escape
> "unlock_index;destroy $w"
233 bind $w <Destroy
> unlock_index
234 wm title
$w "[appname] ([reponame]): Merge"
239 global HEAD commit_type file_states
241 if {[string match amend
* $commit_type]} {
242 info_popup
{Cannot abort
while amending.
244 You must finish amending this commit.
249 if {![lock_index abort
]} return
251 if {[string match
*merge
* $commit_type]} {
257 if {[ask_popup
"Abort $op?
259 Aborting the current $op will cause *ALL* uncommitted changes to be lost.
261 Continue with aborting the current $op?"] eq
{yes
}} {
262 set fd
[open "| git read-tree --reset -u HEAD" r
]
263 fconfigure $fd -blocking 0 -translation binary
264 fileevent $fd readable
[namespace code
[list _reset_wait
$fd]]
265 set ui_status_value
{Aborting... please wait...
}
271 proc _reset_wait
{fd
} {
279 $ui_comm delete
0.0 end
280 $ui_comm edit modified false
282 catch {file delete
[gitdir MERGE_HEAD
]}
283 catch {file delete
[gitdir rr-cache MERGE_RR
]}
284 catch {file delete
[gitdir SQUASH_MSG
]}
285 catch {file delete
[gitdir MERGE_MSG
]}
286 catch {file delete
[gitdir GITGUI_MSG
]}
288 rescan
{set ui_status_value
{Abort completed. Ready.
}}