diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-05-01 02:59:53 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-05-07 23:35:50 -0400 |
| commit | a35d65d9c8a2a6a10d369c00e22aded6fbdff2a9 (patch) | |
| tree | 1d6302ccfbd91654b724a293a9dcb38c2d3d3d97 /lib/merge.tcl | |
| parent | f522c9b5ed367172f969397589ae3d686b867ac0 (diff) | |
| download | git-a35d65d9c8a2a6a10d369c00e22aded6fbdff2a9.tar.gz | |
git-gui: Move console procs into their own namespace
To help modularize git-gui better I'm isolating the code and
variables required to handle our little console windows into
their own namespace. This way we can say console::new rather
than new_console, and the hidden internal procs to create the
window and read data from our filehandle are off in their own
private little land, where most users don't see them.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib/merge.tcl')
| -rw-r--r-- | lib/merge.tcl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl index 75724a930f..e0e84aeabe 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -120,14 +120,14 @@ Please select fewer branches. To merge more than 15 branches, merge the branche set msg "Merging $current_branch, [join $names {, }]" set ui_status_value "$msg..." - set cons [new_console "Merge" $msg] - console_exec $cons $cmd [list finish_merge $revcnt] + set cons [console::new "Merge" $msg] + console::exec $cons $cmd [list finish_merge $revcnt] bind $w <Destroy> {} destroy $w } proc finish_merge {revcnt w ok} { - console_done $w $ok + console::done $w $ok if {$ok} { set msg {Merge completed successfully.} } else { |