class merge {
field w ; # top level window
-field w_list ; # widget of available branches
-field list ; # list of available branches
+field w_rev ; # mega-widget to pick the revision to merge
method _can_merge {} {
global HEAD commit_type file_states
if {[string match amend* $commit_type]} {
- info_popup {Cannot merge while amending.
+ info_popup [mc "Cannot merge while amending.
You must finish amending this commit before starting any type of merge.
-}
+"]
return 0
}
#
repository_state curType curHEAD curMERGE_HEAD
if {$commit_type ne $curType || $HEAD ne $curHEAD} {
- info_popup {Last scanned state does not match repository state.
+ info_popup [mc "Last scanned state does not match repository state.
Another Git program has modified this repository since the last scan. A rescan must be performed before a merge can be performed.
The rescan will be automatically started now.
-}
+"]
unlock_index
rescan ui_ready
return 0
_O {
continue; # and pray it works!
}
+ _U -
U? {
- error_popup "You are in the middle of a conflicted merge.
+ error_popup [mc "You are in the middle of a conflicted merge.
-File [short_path $path] has merge conflicts.
+File %s has merge conflicts.
-You must resolve them, add the file, and commit to complete the current merge. Only then can you begin another merge.
-"
+You must resolve them, stage the file, and commit to complete the current merge. Only then can you begin another merge.
+" [short_path $path]]
unlock_index
return 0
}
?? {
- error_popup "You are in the middle of a change.
+ error_popup [mc "You are in the middle of a change.
-File [short_path $path] is modified.
+File %s is modified.
You should complete the current commit before starting a merge. Doing so will help you abort a failed merge, should the need arise.
-"
+" [short_path $path]]
unlock_index
return 0
}
}
method _rev {} {
- set i [$w_list curselection]
- if {$i >= 0} {
- return [lindex [lindex $list $i] 0]
+ if {[catch {$w_rev commit_or_die}]} {
+ return {}
}
- return {}
+ return [$w_rev get]
}
method _visualize {} {
}
method _start {} {
- global HEAD current_branch
+ global HEAD current_branch remote_url
+ global _last_merged_branch
set name [_rev $this]
if {$name eq {}} {
return
}
- set cmd [list git merge $name]
- set msg "Merging $current_branch and $name"
- ui_status "$msg..."
- set cons [console::new "Merge" $cmd]
+ set spec [$w_rev get_tracking_branch]
+ set cmit [$w_rev get_commit]
+
+ set fh [open [gitdir FETCH_HEAD] w]
+ fconfigure $fh -translation lf
+ if {$spec eq {}} {
+ set remote .
+ set branch $name
+ set stitle $branch
+ } else {
+ set remote $remote_url([lindex $spec 1])
+ if {[regexp {^[^:@]*@[^:]*:/} $remote]} {
+ regsub {^[^:@]*@} $remote {} remote
+ }
+ set branch [lindex $spec 2]
+ set stitle [mc "%s of %s" $branch $remote]
+ }
+ regsub ^refs/heads/ $branch {} branch
+ puts $fh "$cmit\t\tbranch '$branch' of $remote"
+ close $fh
+ set _last_merged_branch $branch
+
+ set cmd [list git]
+ lappend cmd merge
+ lappend cmd --strategy=recursive
+ lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]]
+ lappend cmd HEAD
+ lappend cmd $name
+
+ ui_status [mc "Merging %s and %s..." $current_branch $stitle]
+ set cons [console::new [mc "Merge"] "merge $stitle"]
console::exec $cons $cmd [cb _finish $cons]
wm protocol $w WM_DELETE_WINDOW {}
method _finish {cons ok} {
console::done $cons $ok
if {$ok} {
- set msg {Merge completed successfully.}
+ set msg [mc "Merge completed successfully."]
} else {
- set msg {Merge failed. Conflict resolution is required.}
+ set msg [mc "Merge failed. Conflict resolution is required."]
}
unlock_index
rescan [list ui_status $msg]
constructor dialog {} {
global current_branch
- global M1B
+ global M1B use_ttk NS
if {![_can_merge $this]} {
delete_this
return
}
- set fmt {list %(objectname) %(*objectname) %(refname) %(subject)}
- set fr_fd [git_read for-each-ref \
- --tcl \
- --format=$fmt \
- refs/heads \
- refs/remotes \
- refs/tags \
- ]
- fconfigure $fr_fd -translation binary
- while {[gets $fr_fd line] > 0} {
- set line [eval $line]
- set ref [lindex $line 2]
- regsub ^refs/(heads|remotes|tags)/ $ref {} ref
- set subj($ref) [lindex $line 3]
- lappend sha1([lindex $line 0]) $ref
- if {[lindex $line 1] ne {}} {
- lappend sha1([lindex $line 1]) $ref
- }
- }
- close $fr_fd
-
- set list [list]
- set fr_fd [git_read rev-list --all --not HEAD]
- while {[gets $fr_fd line] > 0} {
- if {[catch {set ref $sha1($line)}]} continue
- foreach n $ref {
- lappend list [list $n $line]
- }
- }
- close $fr_fd
- set list [lsort -unique $list]
-
- make_toplevel top w
- wm title $top "[appname] ([reponame]): Merge"
+ make_dialog top w
+ wm title $top [append "[appname] ([reponame]): " [mc "Merge"]]
if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
}
- set _visualize [cb _visualize]
set _start [cb _start]
- label $w.header \
- -text "Merge Into $current_branch" \
+ ${NS}::label $w.header \
+ -text [mc "Merge Into %s" $current_branch] \
-font font_uibold
pack $w.header -side top -fill x
- frame $w.buttons
- button $w.buttons.visualize -text Visualize -command $_visualize
+ ${NS}::frame $w.buttons
+ ${NS}::button $w.buttons.visualize \
+ -text [mc Visualize] \
+ -command [cb _visualize]
pack $w.buttons.visualize -side left
- button $w.buttons.create -text Merge -command $_start
- pack $w.buttons.create -side right
- button $w.buttons.cancel \
- -text {Cancel} \
+ ${NS}::button $w.buttons.merge \
+ -text [mc Merge] \
+ -command $_start
+ pack $w.buttons.merge -side right
+ ${NS}::button $w.buttons.cancel \
+ -text [mc "Cancel"] \
-command [cb _cancel]
pack $w.buttons.cancel -side right -padx 5
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
- labelframe $w.source -text {Source Branches}
- set w_list $w.source.l
- listbox $w_list \
- -height 10 \
- -width 70 \
- -font font_diff \
- -selectmode browse \
- -yscrollcommand [list $w.source.sby set]
- scrollbar $w.source.sby -command [list $w_list yview]
- pack $w.source.sby -side right -fill y
- pack $w_list -side left -fill both -expand 1
- pack $w.source -fill both -expand 1 -pady 5 -padx 5
-
- foreach ref $list {
- set n [lindex $ref 0]
- if {[string length $n] > 20} {
- set n "[string range $n 0 16]..."
- }
- $w_list insert end [format {%s %-20s %s} \
- [string range [lindex $ref 1] 0 5] \
- $n \
- $subj([lindex $ref 0])]
- }
-
- bind $w_list <Key-K> [list event generate %W <Shift-Key-Up>]
- bind $w_list <Key-J> [list event generate %W <Shift-Key-Down>]
- bind $w_list <Key-k> [list event generate %W <Key-Up>]
- bind $w_list <Key-j> [list event generate %W <Key-Down>]
- bind $w_list <Key-h> [list event generate %W <Key-Left>]
- bind $w_list <Key-l> [list event generate %W <Key-Right>]
- bind $w_list <Key-v> $_visualize
+ set w_rev [::choose_rev::new_unmerged $w.rev [mc "Revision To Merge"]]
+ pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5
bind $w <$M1B-Key-Return> $_start
- bind $w <Visibility> [cb _visible]
+ bind $w <Key-Return> $_start
bind $w <Key-Escape> [cb _cancel]
wm protocol $w WM_DELETE_WINDOW [cb _cancel]
+
+ bind $w.buttons.merge <Visibility> [cb _visible]
tkwait window $w
}
method _visible {} {
grab $w
- focus $w_list
+ if {[is_config_true gui.matchtrackingbranch]} {
+ $w_rev pick_tracking_branch
+ }
+ $w_rev focus_filter
}
method _cancel {} {
global HEAD commit_type file_states
if {[string match amend* $commit_type]} {
- info_popup {Cannot abort while amending.
+ info_popup [mc "Cannot abort while amending.
You must finish amending this commit.
-}
+"]
return
}
if {![lock_index abort]} return
if {[string match *merge* $commit_type]} {
- set op merge
+ set op_question [mc "Abort merge?
+
+Aborting the current merge will cause *ALL* uncommitted changes to be lost.
+
+Continue with aborting the current merge?"]
} else {
- set op commit
- }
+ set op_question [mc "Reset changes?
- if {[ask_popup "Abort $op?
+Resetting the changes will cause *ALL* uncommitted changes to be lost.
-Aborting the current $op will cause *ALL* uncommitted changes to be lost.
+Continue with resetting the current changes?"]
+ }
-Continue with aborting the current $op?"] eq {yes}} {
- set fd [git_read read-tree --reset -u HEAD]
+ if {[ask_popup $op_question] eq {yes}} {
+ set fd [git_read --stderr read-tree --reset -u -v HEAD]
fconfigure $fd -blocking 0 -translation binary
fileevent $fd readable [namespace code [list _reset_wait $fd]]
- ui_status {Aborting... please wait...}
+ $::main_status start [mc "Aborting"] [mc "files reset"]
} else {
unlock_index
}
proc _reset_wait {fd} {
global ui_comm
- read $fd
+ $::main_status update_meter [read $fd]
+
+ fconfigure $fd -blocking 1
if {[eof $fd]} {
- close $fd
+ set fail [catch {close $fd} err]
+ $::main_status stop
unlock_index
$ui_comm delete 0.0 end
catch {file delete [gitdir MERGE_HEAD]}
catch {file delete [gitdir rr-cache MERGE_RR]}
+ catch {file delete [gitdir MERGE_RR]}
catch {file delete [gitdir SQUASH_MSG]}
catch {file delete [gitdir MERGE_MSG]}
catch {file delete [gitdir GITGUI_MSG]}
- rescan {ui_status {Abort completed. Ready.}}
+ if {$fail} {
+ warn_popup "[mc "Abort failed."]\n\n$err"
+ }
+ rescan {ui_status [mc "Abort completed. Ready."]}
+ } else {
+ fconfigure $fd -blocking 0
}
}