[PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to encapsulate its derivation.
- From
Jon Seymour <jon.seymour@gmail.com>
- Date
- Mar 29, 2010, 23:01 UTC
- Message-ID
- <2cfc40321003291601x2b79f816u1cf1f46ccf1a6cb4@mail.gmail.com>
Defined is_unmerged to be [expr {[string first {U} $m] >= 0}] and then replaced uses of {[string first {U} $m] >= 0} with {$is_unmerged}.
This change is made because the subsequent patch will introduce a 3rd use of this expression.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com> --- git-gui/lib/diff.tcl | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl index ec8c11e..e7b1986 100644 --- a/git-gui/lib/diff.tcl +++ b/git-gui/lib/diff.tcl @@ -80,6 +80,7 @@ proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} { global ui_diff ui_index ui_workdir global current_diff_path current_diff_side current_diff_header global current_diff_queue + global is_unmerged if {$diff_active || ![lock_index read]} return @@ -98,6 +99,7 @@ proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} { set s $file_states($path) set m [lindex $s 0] set is_conflict_diff 0 + set is_unmerged [expr {[string first {U} $m] >= 0}] set current_diff_path $path set current_diff_side $w set current_diff_queue {} @@ -105,7 +107,7 @@ proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} { set cont_info [list $scroll_pos $callback] - if {[string first {U} $m] >= 0} { + if {$is_unmerged} { merge_load_stages $path [list show_unmerged_diff $cont_info] } elseif {$m eq {_O}} { show_other_diff $path $w $m $cont_info @@ -258,6 +260,7 @@ proc start_show_diff {cont_info {add_opts {}}} { global is_3way_diff is_submodule_diff diff_active repo_config global ui_diff ui_index ui_workdir global current_diff_path current_diff_side current_diff_header + global is_unmerged set path $current_diff_path set w $current_diff_side @@ -274,7 +277,7 @@ proc start_show_diff {cont_info {add_opts {}}} { lappend cmd diff-index lappend cmd --cached } elseif {$w eq $ui_workdir} { - if {[string first {U} $m] >= 0} { + if {$is_unmerged} { lappend cmd diff } else { lappend cmd diff-files
-- 1.6.6.1