[v2,0/2] git-gui: reduce Tcl version requirement from 8.6 to 8.5

Message

Pratyush Yadav March 17, 2020, 1:29 p.m. UTC

Hi,

Some MacOS distributions ship with Tcl 8.5. This means we can't use
TclOO. So, use our homegrown class.tcl instead.

While here, fix a potential variable name collision by creating a
separate namespace for a chord's script evaluation.

Jonathan,

Can you please test the patches the same way you tested your original
series just to be sure we don't break anything? A review would also be
nice.

Changes in v2:
- Add a note _after_ checking if the user agreed to the deletion.
  Otherwise, if the user denies, two "zombie" notes are left lying
  around which will never be activated. This means that the chord won't
  complete and the index won't be unlocked, leading to git-gui becoming
  frozen.

Pratyush Yadav (2):
  git-gui: reduce Tcl version requirement from 8.6 to 8.5
  git-gui: create a new namespace for chord script evaluation

 git-gui.sh    |  4 ++--
 lib/chord.tcl | 56 +++++++++++++++++++++++++--------------------------
 lib/index.tcl | 10 +++++----
 3 files changed, 35 insertions(+), 35 deletions(-)

--
2.26.0.rc1.11.g30e9940356

Comments

Eric Sunshine March 19, 2020, 3:22 p.m. UTC | #1

On Tue, Mar 17, 2020 at 9:29 AM Pratyush Yadav <[e-mail]> wrote:
> Some MacOS distributions ship with Tcl 8.5. This means we can't use
> TclOO. So, use our homegrown class.tcl instead.
>
> Changes in v2:
> - Add a note _after_ checking if the user agreed to the deletion.
>   Otherwise, if the user denies, two "zombie" notes are left lying
>   around which will never be activated. This means that the chord won't
>   complete and the index won't be unlocked, leading to git-gui becoming
>   frozen.

Thanks. I did some light testing on Mac OS. This re-roll seems to
address the reported problems[1] and allows the new "delete unstaged
file" feature to work on older Tcl. As a fix for the Git 2.25
regression which resulted in git-gui being unable to launch on Mac OS,
this path series seems "good to go".

[1]: https://github.com/prati0100/git-gui/issues/26

Pratyush Yadav March 19, 2020, 4:05 p.m. UTC | #2

On 19/03/20 11:22AM, Eric Sunshine wrote:
> On Tue, Mar 17, 2020 at 9:29 AM Pratyush Yadav <[e-mail]> wrote:
> > Some MacOS distributions ship with Tcl 8.5. This means we can't use
> > TclOO. So, use our homegrown class.tcl instead.
> >
> > Changes in v2:
> > - Add a note _after_ checking if the user agreed to the deletion.
> >   Otherwise, if the user denies, two "zombie" notes are left lying
> >   around which will never be activated. This means that the chord won't
> >   complete and the index won't be unlocked, leading to git-gui becoming
> >   frozen.
> 
> Thanks. I did some light testing on Mac OS. This re-roll seems to
> address the reported problems[1] and allows the new "delete unstaged
> file" feature to work on older Tcl. As a fix for the Git 2.25
> regression which resulted in git-gui being unable to launch on Mac OS,
> this path series seems "good to go".

Thanks for testing. Merged. Thanks all.
 
> [1]: https://github.com/prati0100/git-gui/issues/26