msysgit: does git gui work?

msysgit: does git gui work?

[Steffen Prohaska]

Does 'git gui' work for you in msysgit?

I get

Invalid command name "git-version"
   while executing
"git-version >= 1.5.3"
    (in namespace eval "::blame" script line 36)
[...]

with msysgit (v1.5.3-rc2-690-g8ca1f6a).

	Steffen

Re: msysgit: does git gui work?

[Steffen Prohaska]

On Aug 9, 2007, at 9:24 AM, Steffen Prohaska wrote:

> Does 'git gui' work for you in msysgit?
>
> I get
>
> Invalid command name "git-version"
>   while executing
> "git-version >= 1.5.3"
>    (in namespace eval "::blame" script line 36)
> [...]
>
> with msysgit (v1.5.3-rc2-690-g8ca1f6a)

Ok this is a bit complex but simple to solve: I created a
symlink from tclsh84.exe to tclsh.exe, that is

    cd /mingw/bin
    ln -s tclsh84.exe tclsh.exe

And than run

    make install

[
offtopic:
I also hacked the Makefile to set GIT_VERSION to normal
version number, like 99.9, because git gui complained that
it failed to parse the version number.

I'll look into this later.
]

Now the long story.

mingw only contains tclsh84 but not tclsh. This causes
the Makefile in git-gui to fail on the creation of
lib/tclIndex. Therefore git gui decides to take the slow
path of sourcing the files in lib explicitly but this failes
because they are sourced before git-version is defined.
Therefore blame.tcl reports the error mentioned above.

Johannes (or someone else from the msysgit team),
We should modify mingw to contain the symlink to tclsh.
Or something similar, at least 'tclsh' should be there.

Shawn,
The fallback mechanism of sourcing files from lib is broken.
Either git-version must be defined before sourcing them, or
the auto_index must always work.

	Steffen

Re: msysgit: does git gui work?

[Shawn O. Pearce]

Steffen Prohaska <prohaska@zib.de> wrote:
> mingw only contains tclsh84 but not tclsh. This causes
> the Makefile in git-gui to fail on the creation of
> lib/tclIndex. Therefore git gui decides to take the slow
> path of sourcing the files in lib explicitly but this failes
> because they are sourced before git-version is defined.
> Therefore blame.tcl reports the error mentioned above.
> 
> Johannes (or someone else from the msysgit team),
> We should modify mingw to contain the symlink to tclsh.
> Or something similar, at least 'tclsh' should be there.
> 
> Shawn,
> The fallback mechanism of sourcing files from lib is broken.
> Either git-version must be defined before sourcing them, or
> the auto_index must always work.

*ouch*.  Yea, that happened when the git-version proc was introduced.
It doesn't get declared until after we have sourced everything,
but the things we are sourcing want it to be declared.

The short-term workaround is the obvious thing of just making
sure the auto_index works in the Makefile.  I'll try to reorder
things in git-gui so that the "source everything fallback" is
done only after git-version is declared.  Though that might be
difficult as that codepath assumes error_popup has been declared
and that's in something we are sourcing.

Ouch.

	me: Doctor, it hurts when I declare circular dependencies!
	dr: Well, don't do that son!

-- 
Shawn.

Re: msysgit: does git gui work?

[Steffen Prohaska]

On Aug 10, 2007, at 7:31 AM, Shawn O. Pearce wrote:

> Steffen Prohaska <prohaska@zib.de> wrote:
>> mingw only contains tclsh84 but not tclsh. This causes
>> the Makefile in git-gui to fail on the creation of
>> lib/tclIndex. Therefore git gui decides to take the slow
>> path of sourcing the files in lib explicitly but this failes
>> because they are sourced before git-version is defined.
>> Therefore blame.tcl reports the error mentioned above.
>>
>> Johannes (or someone else from the msysgit team),
>> We should modify mingw to contain the symlink to tclsh.
>> Or something similar, at least 'tclsh' should be there.
>>
>> Shawn,
>> The fallback mechanism of sourcing files from lib is broken.
>> Either git-version must be defined before sourcing them, or
>> the auto_index must always work.
>
> *ouch*.  Yea, that happened when the git-version proc was introduced.
> It doesn't get declared until after we have sourced everything,
> but the things we are sourcing want it to be declared.
>
> The short-term workaround is the obvious thing of just making
> sure the auto_index works in the Makefile.  I'll try to reorder
> things in git-gui so that the "source everything fallback" is
> done only after git-version is declared.  Though that might be
> difficult as that codepath assumes error_popup has been declared
> and that's in something we are sourcing.

Marius, Johannes,
I really think the right way to fix this would be to include
tclsh.exe in mingw. I tried to push a commit to mob but failed
to do so (see separate mail on submodule to the list).

btw,
I recognized that '.' is included in the PATH in /etc/profile.
I don't think this is a good idea. At least it bit me once when
I expected to run /bin/git but instead /git/./git was chosen.
Shouldn't we remove '.' from the PATH?

	Steffen

Re: msysgit: does git gui work?

[Steffen Prohaska]

On Aug 10, 2007, at 9:03 AM, Steffen Prohaska wrote:

> Marius, Johannes,
> I really think the right way to fix this would be to include
> tclsh.exe in mingw. I tried to push a commit to mob but failed
> to do so (see separate mail on submodule to the list).
>
> btw,
> I recognized that '.' is included in the PATH in /etc/profile.
> I don't think this is a good idea. At least it bit me once when
> I expected to run /bin/git but instead /git/./git was chosen.
> Shouldn't we remove '.' from the PATH

Ok, I finally defeated git-submodule and pushed two commits to
the mob branch.

e809cacf22d8dada9801403e19d85e423c51f0d9 profile: removed '.' from PATH
6cd2805a3a2ff5e0c941d1882232a22de9d19bf4 mingw: add tclsh.exe (needed  
by git gui)

	Steffen

Re: msysgit: does git gui work?

[Marius Storm-Olsen]

[-- Attachment #1: Type: text/plain, Size: 1306 bytes --]

Steffen Prohaska said the following on 10.08.2007 09:38:
> On Aug 10, 2007, at 9:03 AM, Steffen Prohaska wrote:
> 
>> Marius, Johannes,
>> I really think the right way to fix this would be to include
>> tclsh.exe in mingw. I tried to push a commit to mob but failed
>> to do so (see separate mail on submodule to the list).
>>
>> btw,
>> I recognized that '.' is included in the PATH in /etc/profile.
>> I don't think this is a good idea. At least it bit me once when
>> I expected to run /bin/git but instead /git/./git was chosen.
>> Shouldn't we remove '.' from the PATH
> 
> Ok, I finally defeated git-submodule and pushed two commits to
> the mob branch.
> 
> e809cacf22d8dada9801403e19d85e423c51f0d9 profile: removed '.' from PATH
> 6cd2805a3a2ff5e0c941d1882232a22de9d19bf4 mingw: add tclsh.exe (needed  

Hi Steffen,

I cherry-picked your patches into my local devel branch, but I still 
have issues with the version number being 1.5.3.rc2.690.g8ca1f6-dirty.
(You mentioned that you also needed to change the Makefile to a 
different version numbering scheme, right?)

So, your patches are still not enough to make it work out-of-box. I'll 
push your patches to the devel branch though, but won't move master 
until we have something which works. Ok?

-- 
.marius


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 187 bytes --]

Re: msysgit: does git gui work?

[Steffen Prohaska]

On Aug 10, 2007, at 9:47 AM, Marius Storm-Olsen wrote:

>
> I cherry-picked your patches into my local devel branch, but I  
> still have issues with the version number being  
> 1.5.3.rc2.690.g8ca1f6-dirty.
> (You mentioned that you also needed to change the Makefile to a  
> different version numbering scheme, right?)
>
> So, your patches are still not enough to make it work out-of-box.  
> I'll push your patches to the devel branch though, but won't move  
> master until we have something which works. Ok?

Ok. If you tested with a dirty working tree you run into the
following problem. git-gui in msysgit doesn't understand
'-dirty' versions. You need to cherry pick from main git the
following commits:

2dfa54c6cb39c443652440f1ee6fdf5a6067364a git-gui: Skip -dirty suffix  
on core git versions
ec4fceece4a9f155afcadec254caff5cef781c67 git-gui: Brown paper bag  
"dirty git version fix"


btw, does someone know, where stderr of wish is piped to.
It doesn't appear on the mingw console, which makes debugging
more challenging.

	Steffen

Re: msysgit: does git gui work?

[Johannes Schindelin]

Hi,

On Fri, 10 Aug 2007, Steffen Prohaska wrote:

> I recognized that '.' is included in the PATH in /etc/profile.
> I don't think this is a good idea. At least it bit me once when
> I expected to run /bin/git but instead /git/./git was chosen.
> Shouldn't we remove '.' from the PATH?

In my experience, Windows users (not Mac users forced to use Windows) 
_expect_ "." to be in the PATH.

Regarding the tclsh thing:  IMHO to unwaste space, we should add a

	#!/bin/sh
	exec tclsh84 "$@"

instead.  MinGW does not have symlinks, and we should not put more space 
to waste than Windows does already, by copying files around (yes, the 
repository will not care, but the working tree will).

Ciao,
Dscho

Re: msysgit: does git gui work?

[Steffen Prohaska]

On Aug 10, 2007, at 12:16 PM, Johannes Schindelin wrote:

> Hi,
>
> On Fri, 10 Aug 2007, Steffen Prohaska wrote:
>
>> I recognized that '.' is included in the PATH in /etc/profile.
>> I don't think this is a good idea. At least it bit me once when
>> I expected to run /bin/git but instead /git/./git was chosen.
>> Shouldn't we remove '.' from the PATH?
>
> In my experience, Windows users (not Mac users forced to use Windows)
> _expect_ "." to be in the PATH.

Ah, what a crazy and dangerous world Windows is ;)

> Regarding the tclsh thing:  IMHO to unwaste space, we should add a
>
> 	#!/bin/sh
> 	exec tclsh84 "$@"
>
> instead.  MinGW does not have symlinks, and we should not put more  
> space
> to waste than Windows does already, by copying files around (yes, the
> repository will not care, but the working tree will).

I agree and pushed the following to mob

faeb4e3df9fb7c853dd1a46d6942776d4a743545

I forced a non-fast-forward of mob. Is this ok? Apparently it's allowed.


Another question related to mob. How do I need to setup /git/.git/config
to be able to push to git's mob?

ssh://mob@repo.or.cz/srv/git/mingw/4msysgit.git

doesn't work for me.

Could the installer setup the mob branches? Or is this too dangerous?
At least it would help new developers to get going. It took me some time
to find the right setup for mob of msysgit and I was not able to set it
up for git. And I heard about the mob concept already before.

	Steffen

Re: msysgit: does git gui work?

[Johannes Schindelin]

Hi,

On Fri, 10 Aug 2007, Steffen Prohaska wrote:

> On Aug 10, 2007, at 12:16 PM, Johannes Schindelin wrote:
> 
> > On Fri, 10 Aug 2007, Steffen Prohaska wrote:
> > 
> > > I recognized that '.' is included in the PATH in /etc/profile.
> > > I don't think this is a good idea. At least it bit me once when
> > > I expected to run /bin/git but instead /git/./git was chosen.
> > > Shouldn't we remove '.' from the PATH?
> > 
> > In my experience, Windows users (not Mac users forced to use Windows)
> > _expect_ "." to be in the PATH.
> 
> Ah, what a crazy and dangerous world Windows is ;)

Yes, and I'd rather not disappoint those expectations.

> > Regarding the tclsh thing:  IMHO to unwaste space, we should add a
> > 
> > 	#!/bin/sh
> > 	exec tclsh84 "$@"
> > 
> > instead.  MinGW does not have symlinks, and we should not put more space
> > to waste than Windows does already, by copying files around (yes, the
> > repository will not care, but the working tree will).
> 
> I agree and pushed the following to mob
> 
> faeb4e3df9fb7c853dd1a46d6942776d4a743545
> 
> I forced a non-fast-forward of mob. Is this ok? Apparently it's allowed.

Yes, it is allowed exactly for this purpose.  When you want to redo/undo 
commits.

> Another question related to mob. How do I need to setup /git/.git/config
> to be able to push to git's mob?

My understanding is that the GitMe installer already sets up a remote 
named "mob".

	$ git push mob

It automatically pushes the "master" branch to "mob".  If you have to 
force the push, you'll have to do this:

	$ git push mob +master:mob

But please avoid this when possible, since you might well overwrite other 
people's work.

Ciao,
Dscho

Re: msysgit: does git gui work?

[Steffen Prohaska]

On Aug 10, 2007, at 2:13 PM, Johannes Schindelin wrote:

> Hi,
>
> On Fri, 10 Aug 2007, Steffen Prohaska wrote:
>
>> On Aug 10, 2007, at 12:16 PM, Johannes Schindelin wrote:
>>
>>> On Fri, 10 Aug 2007, Steffen Prohaska wrote:
>>
>> I agree and pushed the following to mob
>>
>> faeb4e3df9fb7c853dd1a46d6942776d4a743545
>>
>> I forced a non-fast-forward of mob. Is this ok? Apparently it's  
>> allowed.
>
> Yes, it is allowed exactly for this purpose.  When you want to redo/ 
> undo
> commits.
>
>> Another question related to mob. How do I need to setup /git/.git/ 
>> config
>> to be able to push to git's mob?
>
> My understanding is that the GitMe installer already sets up a remote
> named "mob".
>
> 	$ git push mob
>
> It automatically pushes the "master" branch to "mob".  If you have to
> force the push, you'll have to do this:
>
> 	$ git push mob +master:mob
>
> But please avoid this when possible, since you might well overwrite  
> other
> people's work.

I have a mob for /.git, but I do not have the setup for /git/.git. Maybe
I deleted it because I didn't understand what is means.

So, what is the right remote for pushing /git/.git?
Where is the mob branch for git://repo.or.cz/git/mingw/4msysgit.git/ ?

Whoever has setup the mob configurations, maybe it would be a good idea
to forbid non-fast-forward but instead allow the creation of new mob*
branches. If I can't push to mob, I could push to mob-topic instead.
Cleanup would be in the responsibility of the repository owner.

	Steffen

Re: msysgit: does git gui work?

[Johannes Schindelin]

Hi,

On Fri, 10 Aug 2007, Steffen Prohaska wrote:

> On Aug 10, 2007, at 2:13 PM, Johannes Schindelin wrote:
> 
> > On Fri, 10 Aug 2007, Steffen Prohaska wrote:
> > 
> > > On Aug 10, 2007, at 12:16 PM, Johannes Schindelin wrote:
> > > 
> > > > On Fri, 10 Aug 2007, Steffen Prohaska wrote:
> > > 
> > > I agree and pushed the following to mob
> > > 
> > > faeb4e3df9fb7c853dd1a46d6942776d4a743545
> > > 
> > > I forced a non-fast-forward of mob. Is this ok? Apparently it's allowed.
> > 
> > Yes, it is allowed exactly for this purpose.  When you want to redo/undo
> > commits.
> > 
> > > Another question related to mob. How do I need to setup /git/.git/config
> > > to be able to push to git's mob?
> > 
> > My understanding is that the GitMe installer already sets up a remote
> > named "mob".
> > 
> > 	$ git push mob
> > 
> > It automatically pushes the "master" branch to "mob".  If you have to
> > force the push, you'll have to do this:
> > 
> > 	$ git push mob +master:mob
> > 
> > But please avoid this when possible, since you might well overwrite other
> > people's work.
> 
> I have a mob for /.git, but I do not have the setup for /git/.git. Maybe
> I deleted it because I didn't understand what is means.

Ah, I misunderstood.  Yes, it is quite possible to have a mob installed 
for 4msysgit.git by default.  Should by done in 
msysgit.git:share/GitMe/setup-msysgit.sh.

> Whoever has setup the mob configurations, maybe it would be a good idea 
> to forbid non-fast-forward but instead allow the creation of new mob* 
> branches. If I can't push to mob, I could push to mob-topic instead. 
> Cleanup would be in the responsibility of the repository owner.

This is not possible.  The refusal of a non-fast-forward is a per-repo, 
not a per-user, configuration.

Ciao,
Dscho

Re: msysgit: does git gui work?

[Steffen Prohaska]

On Aug 10, 2007, at 3:53 PM, Johannes Schindelin wrote:

> On Fri, 10 Aug 2007, Steffen Prohaska wrote:
>
>> I have a mob for /.git, but I do not have the setup for /git/.git.  
>> Maybe
>> I deleted it because I didn't understand what is means.
>
> Ah, I misunderstood.  Yes, it is quite possible to have a mob  
> installed
> for 4msysgit.git by default.  Should by done in
> msysgit.git:share/GitMe/setup-msysgit.sh.

Yeah, but what is the right URL to push mob to? I wasn't abel to
figure it out.


>> Whoever has setup the mob configurations, maybe it would be a good  
>> idea
>> to forbid non-fast-forward but instead allow the creation of new mob*
>> branches. If I can't push to mob, I could push to mob-topic instead.
>> Cleanup would be in the responsibility of the repository owner.
>
> This is not possible.  The refusal of a non-fast-forward is a per- 
> repo,
> not a per-user, configuration.

I see.

I expected some scripting magic in place that already deals with  
handling
the mob user, and expected it could be used to deny fast-forwards on  
a per
user basis. But I haven't looked into the git scripting hooks so far.
So I have basically no clue about what I'm talking here ;)

	Steffen

Re: msysgit: does git gui work?

[Alex Riesen]

On 8/10/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> On Fri, 10 Aug 2007, Steffen Prohaska wrote:
>
> > I recognized that '.' is included in the PATH in /etc/profile.
> > I don't think this is a good idea. At least it bit me once when
> > I expected to run /bin/git but instead /git/./git was chosen.
> > Shouldn't we remove '.' from the PATH?
>
> In my experience, Windows users (not Mac users forced to use Windows)
> _expect_ "." to be in the PATH.

...because they _cannot_ know otherwise. In Windows, you cannot remove "."
from PATH, it is implicitly in it.
It is actually worse than that: the system directories are in PATH
too. Unconditionally.
Yes, the same system directories all them programs put their .exes into.

Re: msysgit: does git gui work?

[Dmitry Kakurin]

From: "Alex Riesen" <raa.lkml@gmail.com>
>> In my experience, Windows users (not Mac users forced to use Windows)
>> _expect_ "." to be in the PATH.
> 
> ...because they _cannot_ know otherwise. In Windows, you cannot remove "."
> from PATH, it is implicitly in it.
> It is actually worse than that: the system directories are in PATH
> too. Unconditionally.
> Yes, the same system directories all them programs put their .exes into.

This is not true:
C:\>where cmd.exe
C:\Windows\System32\cmd.exe

C:\>set path=

C:\>cmd
'cmd' is not recognized as an internal or external command,
operable program or batch file.

Also there is an option to exclude implicit '.' from path, but no one uses it because too many things will break.

- Dmitry

Re: msysgit: does git gui work?

[Alex Riesen]

Dmitry Kakurin, Sat, Aug 11, 2007 08:10:50 +0200:
> From: "Alex Riesen" <raa.lkml@gmail.com>
> >>In my experience, Windows users (not Mac users forced to use Windows)
> >>_expect_ "." to be in the PATH.
> >
> >...because they _cannot_ know otherwise. In Windows, you cannot remove "."
> >from PATH, it is implicitly in it.
> >It is actually worse than that: the system directories are in PATH
> >too. Unconditionally.
> >Yes, the same system directories all them programs put their .exes into.
> 
> This is not true:

I didn't say that. _They_ say that:

    http://msdn2.microsoft.com/en-us/library/ms682425.aspx

Re: msysgit: does git gui work?

[Brett Schwarz]

> 
> btw, does someone know, where stderr of wish is piped to.
> It doesn't appear on the mingw console, which makes debugging
> more challenging.
> 

"wish" redirects it. If you want to see it, you need to add a "console show" command near the top of the script. Another way around this, is to have tclsh as the program, and do a "package require Tk"

HTH,
    --brett




       
____________________________________________________________________________________
Take the Internet to Go: Yahoo!Go puts the Internet in your pocket: mail, news, photos & more. 
http://mobile.yahoo.com/go?refer=1GNXIC