guile contributor setup

guile contributor setup

[Catonano]

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

Hello people,

I'm considering the idea of trying to contribute some Scheme code to guile,
and I'm running into some issues with emails, patches, git and the such.

What's the common setup you people use ?

I copied a patch from my gmail web inerface and pasted in a local file, but
I discovered I had to run dos2unix on it in order to git to process it
properly (see
http://stackoverflow.com/questions/1821267/how-can-i-apply-a-patch-file-in-git)
and then I also run into another issue that seems to be associated my gmail
use.

So I was wondering: am I supposed to use Mutt or anything else ?

I see there's an "emacs" folder in the guile folder, how many of you use
"patch.el", for example ?

What are common setups that guile contributors happen to use ?

Thanks
Catonano

[-- Attachment #2: Type: text/html, Size: 962 bytes --]

Re: guile contributor setup

[Peter TB Brett]

Catonano <catonano@gmail.com> writes:

> I copied a patch from my gmail web inerface and pasted in a local file, but I
> discovered I had to run dos2unix on it in order to git to process it properly
> (see http://stackoverflow.com/questions/1821267/
> how-can-i-apply-a-patch-file-in-git) and then I also run into another issue
> that seems to be associated my gmail use.

GMail routinely mangles patches.  If you wish to send a patch using
GMail, I *strongly* recommend sending it as an attachment rather than
inline.

                               Peter

-- 
Peter Brett <peter@peter-b.co.uk>
Remote Sensing Research Group
Surrey Space Centre

Re: guile contributor setup

[Andy Wingo]

On Thu 02 Feb 2012 15:44, Catonano <catonano@gmail.com> writes:

> I'm considering the idea of trying to contribute some Scheme code to
> guile, and I'm running into some issues with emails, patches, git and
> the such.
>
> What's the common setup you people use ?

I use git, from the command line and from Emacs.  When I use it from
Emacs, I use magit: http://philjackson.github.com/magit/

I mostly use magit to commit, and otherwise the command line to update,
rebase, etc.  I use gitk sometimes to get a graphical representations of
"the big picture".

When I make a patch and want to mail it, I use magit to commit it with a
nice log.  Then on the command-line I do "git format-patch
origin/stable-2.0..HEAD" and that spits out one file for each commit I
made that is not in upstream stable-2.0.  I then attach them to mails.

I use Gnus for mail, in emacs.  When I receive a patch, I pipe it to a
(cd ~/src/guile; git am -3).  That usually applies it fine.  I could
save the file and use git am -3 manually tho.

That's pretty much it!

A
-- 
http://wingolog.org/

Re: guile contributor setup

[Neil Jerram]

Andy Wingo <wingo@pobox.com> writes:

> On Thu 02 Feb 2012 15:44, Catonano <catonano@gmail.com> writes:
>
>> I'm considering the idea of trying to contribute some Scheme code to
>> guile, and I'm running into some issues with emails, patches, git and
>> the such.
>>
>> What's the common setup you people use ?
>
> I use git, from the command line and from Emacs.  When I use it from
> Emacs, I use magit: http://philjackson.github.com/magit/
>
> I mostly use magit to commit, and otherwise the command line to update,
> rebase, etc.  I use gitk sometimes to get a graphical representations of
> "the big picture".
>
> When I make a patch and want to mail it, I use magit to commit it with a
> nice log.  Then on the command-line I do "git format-patch
> origin/stable-2.0..HEAD" and that spits out one file for each commit I
> made that is not in upstream stable-2.0.  I then attach them to mails.

FWIW, 100% snap!

    Neil

Re: guile contributor setup

[Peter TB Brett]

Andy Wingo <wingo@pobox.com> writes:

> I use git, from the command line and from Emacs.  When I use it from
> Emacs, I use magit: http://philjackson.github.com/magit/
>
> I mostly use magit to commit, and otherwise the command line to update,
> rebase, etc.  I use gitk sometimes to get a graphical representations of
> "the big picture".

I use stgit, with stgit-mode for Emacs.  Best patch stack management
tool *ever*.

                              Peter

-- 
Peter Brett <peter@peter-b.co.uk>
Remote Sensing Research Group
Surrey Space Centre

Re: guile contributor setup

[Catonano]

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

People,

thank you all for your overviews.

I guess I have to go a bit off topic, here. Admittedly I'm not a Git master
and I'm having an issue.

I made my own brand new branch, checked out into it, I successfully applied
a patch onto it. The status shows nothing to commit, the log shows the
patch applied.

But the affected files aren't changed, they are as they were.

What's going on, here ?

Thanks for any hint

[-- Attachment #2: Type: text/html, Size: 480 bytes --]

Re: guile contributor setup

[Catonano]

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

I reply to myself.

Ok, my bad, the patch was corectly applied. Sorry

[-- Attachment #2: Type: text/html, Size: 84 bytes --]