提交 ee3cfb59 编写于 作者: S Shawn O. Pearce

git-gui: Update status bar during a merge.

I got slightly confused when I did two merges in a row, as the status
bar said "merge completed successfully" while the second merge was
still running.  Now we show what branches are actively being merged.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
上级 ce9735df
...@@ -2658,7 +2658,7 @@ proc visualize_local_merge {w} { ...@@ -2658,7 +2658,7 @@ proc visualize_local_merge {w} {
} }
proc start_local_merge_action {w} { proc start_local_merge_action {w} {
global HEAD global HEAD ui_status_value current_branch
set cmd [list git merge] set cmd [list git merge]
set names {} set names {}
...@@ -2694,7 +2694,9 @@ than 15 branches, merge the branches in batches. ...@@ -2694,7 +2694,9 @@ than 15 branches, merge the branches in batches.
return return
} }
set cons [new_console "Merge" "Merging [join $names {, }]"] set msg "Merging $current_branch, [join $names {, }]"
set ui_status_value "$msg..."
set cons [new_console "Merge" $msg]
console_exec $cons $cmd finish_merge console_exec $cons $cmd finish_merge
bind $w <Destroy> {} bind $w <Destroy> {}
destroy $w destroy $w
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册