* [PATCH] git-gui.sh: support Tcl 8.4
@ 2015-01-06 10:41 Kyle J. McKay
2015-01-06 19:42 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Kyle J. McKay @ 2015-01-06 10:41 UTC (permalink / raw)
To: Jens Lehmann; +Cc: Git mailing list
Tcl 8.5 introduced an extended vsatisfies syntax that is not
supported by Tcl 8.4.
Since only Tcl 8.4 is required this presents a problem.
The extended syntax was used starting with Git 2.0.0 in
commit b3f0c5c0 so that a major version change would still
satisfy the condition.
However, what we really want is just a basic version compare,
so use vcompare instead to restore compatibility with Tcl 8.4.
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]
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] git-gui.sh: support Tcl 8.4
2015-01-06 10:41 [PATCH] git-gui.sh: support Tcl 8.4 Kyle J. McKay
@ 2015-01-06 19:42 ` Junio C Hamano
2015-01-06 22:47 ` Kyle J. McKay
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2015-01-06 19:42 UTC (permalink / raw)
To: Kyle J. McKay; +Cc: Jens Lehmann, Git mailing list
"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.
> 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]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] git-gui.sh: support Tcl 8.4
2015-01-06 19:42 ` Junio C Hamano
@ 2015-01-06 22:47 ` Kyle J. McKay
2015-01-07 0:02 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Kyle J. McKay @ 2015-01-06 22:47 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Jens Lehmann, Git mailing list
On Jan 6, 2015, at 11:42, Junio C Hamano wrote:
> "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.
My Tcl is barely operational, but I'll give it a shot. :)
> * 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.
Thanks for the reference. That patch proposed this type of change:
- if {[package vsatisfies $::_git_version 1.6.3]} {
+ if {[package vcompare $::_git_version 1.6.3]} {
But that's wrong because vsatisfies returns a boolean but vcompare
returns an integer (think strcmp result) so the proposed change is
testing whether the version is not 1.6.3 rather than being 1.6.3 or
greater. But Jens mentions this in $gmane/249491 (that the original
patch was missing the ">= 0" part).
I can't find anything in that thread about why vsatisfies was
preferred over vcompare other than the obvious that the vsatisfies
version is only a 1-character change. And that would be more than
enough except that Tcl 8.4 doesn't support the trailing '-' vsatisfies
syntax. There are complaints about this problem with git-gui [1] by
folks who have Tcl 8.4 on their system and have upgraded to Git 2.0 or
later.
> * 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.
Makes sense to me, but my Tcl knowledge isn't up to making those
changes as the code's a bit different. I have to paraphrase Chris's
message here by saying that I guess those checks are correct if not
consistent with the others.
[1] http://stackoverflow.com/questions/24315854/git-gui-cannot-start-because-of-bad-version-number
-Kyle
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] git-gui.sh: support Tcl 8.4
2015-01-06 22:47 ` Kyle J. McKay
@ 2015-01-07 0:02 ` Junio C Hamano
2015-01-07 7:35 ` Jens Lehmann
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2015-01-07 0:02 UTC (permalink / raw)
To: Kyle J. McKay; +Cc: Jens Lehmann, Git mailing list, Pat Thoyts
^"Kyle J. McKay" <mackyle@gmail.com> writes:
> greater. But Jens mentions this in $gmane/249491 (that the original
> patch was missing the ">= 0" part).
Ah, that is what I missed. Thanks.
> I can't find anything in that thread about why vsatisfies was
> preferred over vcompare other than the obvious that the vsatisfies
> version is only a 1-character change. And that would be more than
> enough except that Tcl 8.4 doesn't support the trailing '-' vsatisfies
> syntax.
Yeah, I fully agree with that observation.
>> * 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.
>
> Makes sense to me, but my Tcl knowledge isn't up to making those
> changes as the code's a bit different. I have to paraphrase Chris's
> message here by saying that I guess those checks are correct if not
> consistent with the others.
OK, let's ask Pat (cc'ed) to apply your version as-is without
touching these 1.5.3 references. I do not take patches to git-gui
directly to my tree.
Thanks.
-- >8 --
From: "Kyle J. McKay" <mackyle@gmail.com>
Date: Tue, 6 Jan 2015 02:41:21 -0800
Tcl 8.5 introduced an extended vsatisfies syntax that is not
supported by Tcl 8.4.
Since only Tcl 8.4 is required this presents a problem.
The extended syntax was used starting with Git 2.0.0 in commit
b3f0c5c0 (git-gui: tolerate major version changes when comparing the
git version, 2014-05-17), so that a major version change would still
satisfy the condition.
However, what we really want is just a basic version compare, so use
vcompare instead to restore compatibility with Tcl 8.4.
Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
git-gui.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-gui.sh b/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]
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] git-gui.sh: support Tcl 8.4
2015-01-07 0:02 ` Junio C Hamano
@ 2015-01-07 7:35 ` Jens Lehmann
2015-01-13 1:12 ` Pat Thoyts
0 siblings, 1 reply; 6+ messages in thread
From: Jens Lehmann @ 2015-01-07 7:35 UTC (permalink / raw)
To: Junio C Hamano, Kyle J. McKay; +Cc: Git mailing list, Pat Thoyts
Am 07.01.2015 um 01:02 schrieb Junio C Hamano:
> ^"Kyle J. McKay" <mackyle@gmail.com> writes:
>> I can't find anything in that thread about why vsatisfies was
>> preferred over vcompare other than the obvious that the vsatisfies
>> version is only a 1-character change. And that would be more than
>> enough except that Tcl 8.4 doesn't support the trailing '-' vsatisfies
>> syntax.
>
> Yeah, I fully agree with that observation.
Having rather corroded TCL-knowledge myself it was Pat's comment in
http://thread.gmane.org/gmane.comp.version-control.git/247511/focus=249464
that made me change the patch to use the smaller change of adding
the trailing '-' after vsatisfies instead of using vcompare with
a trailing ">= 0" in v2.
>>> * 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.
>>
>> Makes sense to me, but my Tcl knowledge isn't up to making those
>> changes as the code's a bit different. I have to paraphrase Chris's
>> message here by saying that I guess those checks are correct if not
>> consistent with the others.
When I looked at it back then I was convinced these checks are ok
and should stay as they are to support ancient Git versions (and
they do not use vsatisfies either).
> OK, let's ask Pat (cc'ed) to apply your version as-is without
> touching these 1.5.3 references. I do not take patches to git-gui
> directly to my tree.
It's an ack from me on the change below as that was what I came up
with and tested successfully before Pat suggested to just add the '-'.
> -- >8 --
> From: "Kyle J. McKay" <mackyle@gmail.com>
> Date: Tue, 6 Jan 2015 02:41:21 -0800
>
> Tcl 8.5 introduced an extended vsatisfies syntax that is not
> supported by Tcl 8.4.
>
> Since only Tcl 8.4 is required this presents a problem.
>
> The extended syntax was used starting with Git 2.0.0 in commit
> b3f0c5c0 (git-gui: tolerate major version changes when comparing the
> git version, 2014-05-17), so that a major version change would still
> satisfy the condition.
>
> However, what we really want is just a basic version compare, so use
> vcompare instead to restore compatibility with Tcl 8.4.
>
> Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> git-gui.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/git-gui.sh b/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]
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] git-gui.sh: support Tcl 8.4
2015-01-07 7:35 ` Jens Lehmann
@ 2015-01-13 1:12 ` Pat Thoyts
0 siblings, 0 replies; 6+ messages in thread
From: Pat Thoyts @ 2015-01-13 1:12 UTC (permalink / raw)
To: Jens Lehmann; +Cc: Junio C Hamano, Kyle J. McKay, Git mailing list
Jens Lehmann <Jens.Lehmann@web.de> writes:
>Am 07.01.2015 um 01:02 schrieb Junio C Hamano:
>> ^"Kyle J. McKay" <mackyle@gmail.com> writes:
>>> I can't find anything in that thread about why vsatisfies was
>>> preferred over vcompare other than the obvious that the vsatisfies
>>> version is only a 1-character change. And that would be more than
>>> enough except that Tcl 8.4 doesn't support the trailing '-' vsatisfies
>>> syntax.
>>
>> Yeah, I fully agree with that observation.
>
>Having rather corroded TCL-knowledge myself it was Pat's comment in
>
> http://thread.gmane.org/gmane.comp.version-control.git/247511/focus=249464
>
>that made me change the patch to use the smaller change of adding
>the trailing '-' after vsatisfies instead of using vcompare with
>a trailing ">= 0" in v2.
>
>>>> * 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.
>>>
>>> Makes sense to me, but my Tcl knowledge isn't up to making those
>>> changes as the code's a bit different. I have to paraphrase Chris's
>>> message here by saying that I guess those checks are correct if not
>>> consistent with the others.
>
>When I looked at it back then I was convinced these checks are ok
>and should stay as they are to support ancient Git versions (and
>they do not use vsatisfies either).
>
>> OK, let's ask Pat (cc'ed) to apply your version as-is without
>> touching these 1.5.3 references. I do not take patches to git-gui
>> directly to my tree.
>
>It's an ack from me on the change below as that was what I came up
>with and tested successfully before Pat suggested to just add the '-'.
>
>> -- >8 --
>> From: "Kyle J. McKay" <mackyle@gmail.com>
>> Date: Tue, 6 Jan 2015 02:41:21 -0800
>>
>> Tcl 8.5 introduced an extended vsatisfies syntax that is not
>> supported by Tcl 8.4.
>>
>> Since only Tcl 8.4 is required this presents a problem.
>>
>> The extended syntax was used starting with Git 2.0.0 in commit
>> b3f0c5c0 (git-gui: tolerate major version changes when comparing the
>> git version, 2014-05-17), so that a major version change would still
>> satisfy the condition.
>>
>> However, what we really want is just a basic version compare, so use
>> vcompare instead to restore compatibility with Tcl 8.4.
>>
>> Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
>> Signed-off-by: Junio C Hamano <gitster@pobox.com>
>> ---
>> git-gui.sh | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/git-gui.sh b/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]
>>
>
This look good and tested ok with 8.4.19.
vsatisfies is the smarter command but vcompare will work just fine as it
is used here given the git version string gets pre-processed before any
comparisons are performed. The vcompare test will be ok with increasing
major version numbers in the future.
Applied.
--
Pat Thoyts http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-01-13 1:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-06 10:41 [PATCH] git-gui.sh: support Tcl 8.4 Kyle J. McKay
2015-01-06 19:42 ` Junio C Hamano
2015-01-06 22:47 ` Kyle J. McKay
2015-01-07 0:02 ` Junio C Hamano
2015-01-07 7:35 ` Jens Lehmann
2015-01-13 1:12 ` Pat Thoyts
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).