Re: [PATCH] git-gui.sh: support Tcl 8.4

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 6, 2015, 19:42 UTC
Message-ID: <xmqqvbkjofvw.fsf@gitster.dls.corp.google.com>
In-Reply-To: <97e448e7908a1f959a7294e389553b5@74d39fa044aa309eaea14b9f57fe79c>

"Kyle J. McKay" <mackyle@gmail.com> writes:

> Tcl 8.5 introduced an extended vsatisfies syntax that is not
> supported by Tcl 8.4.

Interesting.  We discussed this exact thing just before 2.0 in

    http://thread.gmane.org/gmane.comp.version-control.git/247511/focus=248858

and nobody seems to have noticed that giving the new range notation to vsatisfies is too new back then.

> Since only Tcl 8.4 is required this presents a problem.

Indeed.

> However, what we really want is just a basic version compare,
> so use vcompare instead to restore compatibility with Tcl 8.4.

My Tcl is not just rusty but corroded, so help me out here.

 * Your version that compares the sign of the result looks more
   correct than $gmane/248858; was the patch proposed back then but
   did not get applied wrong?  This question is out of mere
   curiosity.

 * Would it be a good idea to update the places $gmane/248895 points
   out?  It is clearly outside the scope of this fix, but we may
   want to do so while our mind is on the "how do we check required
   version?" in a separate patch.

Thanks.

Show 27 quoted lines

> Signed-off-by: Kyle J. McKay
> ---
>  git-gui/git-gui.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
> index b186329d..a1a23b56 100755
> --- a/git-gui/git-gui.sh
> +++ b/git-gui/git-gui.sh
> @@ -1283,7 +1283,7 @@ load_config 0
>  apply_config
>  
>  # v1.7.0 introduced --show-toplevel to return the canonical work-tree
> -if {[package vsatisfies $_git_version 1.7.0-]} {
> +if {[package vcompare $_git_version 1.7.0] >= 0} {
>  	if { [is_Cygwin] } {
>  		catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]}
>  	} else {
> @@ -1539,7 +1539,7 @@ proc rescan_stage2 {fd after} {
>  		close $fd
>  	}
>  
> -	if {[package vsatisfies $::_git_version 1.6.3-]} {
> +	if {[package vcompare $::_git_version 1.6.3] >= 0} {
>  		set ls_others [list --exclude-standard]
>  	} else {
>  		set ls_others [list --exclude-per-directory=.gitignore]