> Is the formatting script in git?

longline.c is the source of the reporter

Formatting in emacs
         (c-set-offset 'defun-block-intro 4)
         (setq c-block-comments-indent-p nil)
         (setq c-basic-offset 2)

==John ffitch

------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

> So that basically means 4 spaces for the first indent 2 from then on and
> don't indent comments?

The c-block-comments-indent-p can be ignored -- obsolete and I had not
actually removed it.

and no tabs (as there is disagreement as what it means), 85 char line
maximum (not everyone has super-wide screens or good eyesight).

Personally I also really dislike lack of space after keywords like if and
for, and lots of blank lines.

>
> Cheers,
> Andrés
>
>
> On Fri, Jul 19, 2013 at 11:45 AM, john ffitch  wrote:
>
>> > Is the formatting script in git?
>>
>> longline.c is the source of the reporter
>>
>> Formatting in emacs
>>          (c-set-offset 'defun-block-intro 4)
>>          (setq c-block-comments-indent-p nil)
>>          (setq c-basic-offset 2)
>>
>> ==John ffitch
>>
>>
>> ------------------------------------------------------------------------------
>> See everything from the browser to the database with AppDynamics
>> Get end-to-end visibility with application monitoring from AppDynamics
>> Isolate bottlenecks and diagnose root cause in seconds.
>> Start your free trial of AppDynamics Pro today!
>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
>> _______________________________________________
>> Csound-devel mailing list
>> Csound-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>
> ------------------------------------------------------------------------------
> See everything from the browser to the database with AppDynamics
> Get end-to-end visibility with application monitoring from AppDynamics
> Isolate bottlenecks and diagnose root cause in seconds.
> Start your free trial of AppDynamics Pro today!
> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk_______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel
>



------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

I'm wondering if we could create a git hook to automatically run this
(or astyle, or other autoformatting tool) on every commit before the
commit goes through.  Does anyone have experience with git hooks?  I
have not ever used hooks with any SCM tool but wonder if this could
solve a problem here.

On Sat, Jul 20, 2013 at 6:17 AM,   wrote:
>> So that basically means 4 spaces for the first indent 2 from then on and
>> don't indent comments?
>
> The c-block-comments-indent-p can be ignored -- obsolete and I had not
> actually removed it.
>
> and no tabs (as there is disagreement as what it means), 85 char line
> maximum (not everyone has super-wide screens or good eyesight).
>
> Personally I also really dislike lack of space after keywords like if and
> for, and lots of blank lines.
>
>>
>> Cheers,
>> Andrés
>>
>>
>> On Fri, Jul 19, 2013 at 11:45 AM, john ffitch  wrote:
>>
>>> > Is the formatting script in git?
>>>
>>> longline.c is the source of the reporter
>>>
>>> Formatting in emacs
>>>          (c-set-offset 'defun-block-intro 4)
>>>          (setq c-block-comments-indent-p nil)
>>>          (setq c-basic-offset 2)
>>>
>>> ==John ffitch
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> See everything from the browser to the database with AppDynamics
>>> Get end-to-end visibility with application monitoring from AppDynamics
>>> Isolate bottlenecks and diagnose root cause in seconds.
>>> Start your free trial of AppDynamics Pro today!
>>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
>>> _______________________________________________
>>> Csound-devel mailing list
>>> Csound-devel@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>>
>> ------------------------------------------------------------------------------
>> See everything from the browser to the database with AppDynamics
>> Get end-to-end visibility with application monitoring from AppDynamics
>> Isolate bottlenecks and diagnose root cause in seconds.
>> Start your free trial of AppDynamics Pro today!
>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk_______________________________________________
>> Csound-devel mailing list
>> Csound-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>
>
>
>
> ------------------------------------------------------------------------------
> See everything from the browser to the database with AppDynamics
> Get end-to-end visibility with application monitoring from AppDynamics
> Isolate bottlenecks and diagnose root cause in seconds.
> Start your free trial of AppDynamics Pro today!
> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel

------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

You certainly can forbid commits that fail a certain command (ie, you
can check if a source file complies with the style, and if not refuse
to commit). I'm not sure it is possible to modify the file being
commited.

On Tue, Jul 23, 2013 at 1:55 AM, Steven Yi  wrote:
> I'm wondering if we could create a git hook to automatically run this
> (or astyle, or other autoformatting tool) on every commit before the
> commit goes through.  Does anyone have experience with git hooks?  I
> have not ever used hooks with any SCM tool but wonder if this could
> solve a problem here.
>
> On Sat, Jul 20, 2013 at 6:17 AM,   wrote:
>>> So that basically means 4 spaces for the first indent 2 from then on and
>>> don't indent comments?
>>
>> The c-block-comments-indent-p can be ignored -- obsolete and I had not
>> actually removed it.
>>
>> and no tabs (as there is disagreement as what it means), 85 char line
>> maximum (not everyone has super-wide screens or good eyesight).
>>
>> Personally I also really dislike lack of space after keywords like if and
>> for, and lots of blank lines.
>>
>>>
>>> Cheers,
>>> Andrés
>>>
>>>
>>> On Fri, Jul 19, 2013 at 11:45 AM, john ffitch  wrote:
>>>
>>>> > Is the formatting script in git?
>>>>
>>>> longline.c is the source of the reporter
>>>>
>>>> Formatting in emacs
>>>>          (c-set-offset 'defun-block-intro 4)
>>>>          (setq c-block-comments-indent-p nil)
>>>>          (setq c-basic-offset 2)
>>>>
>>>> ==John ffitch
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> See everything from the browser to the database with AppDynamics
>>>> Get end-to-end visibility with application monitoring from AppDynamics
>>>> Isolate bottlenecks and diagnose root cause in seconds.
>>>> Start your free trial of AppDynamics Pro today!
>>>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
>>>> _______________________________________________
>>>> Csound-devel mailing list
>>>> Csound-devel@lists.sourceforge.net
>>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>>>
>>> ------------------------------------------------------------------------------
>>> See everything from the browser to the database with AppDynamics
>>> Get end-to-end visibility with application monitoring from AppDynamics
>>> Isolate bottlenecks and diagnose root cause in seconds.
>>> Start your free trial of AppDynamics Pro today!
>>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk_______________________________________________
>>> Csound-devel mailing list
>>> Csound-devel@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>>
>>
>>
>>
>> ------------------------------------------------------------------------------
>> See everything from the browser to the database with AppDynamics
>> Get end-to-end visibility with application monitoring from AppDynamics
>> Isolate bottlenecks and diagnose root cause in seconds.
>> Start your free trial of AppDynamics Pro today!
>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
>> _______________________________________________
>> Csound-devel mailing list
>> Csound-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>
> ------------------------------------------------------------------------------
> See everything from the browser to the database with AppDynamics
> Get end-to-end visibility with application monitoring from AppDynamics
> Isolate bottlenecks and diagnose root cause in seconds.
> Start your free trial of AppDynamics Pro today!
> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel



-- 

Saludos,
Felipe Sateler

------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net
https://lists.sourcefor

I guess then that could work out just fine if we can use the tool to
check to also be the tool to format.  It'd be an additional
requirement for csound development though, so another barrier to
entry. I don't know if this would help John's situation with strange
merge errors though.

On Tue, Jul 23, 2013 at 9:16 AM, Felipe Sateler  wrote:
> You certainly can forbid commits that fail a certain command (ie, you
> can check if a source file complies with the style, and if not refuse
> to commit). I'm not sure it is possible to modify the file being
> commited.
>
> On Tue, Jul 23, 2013 at 1:55 AM, Steven Yi  wrote:
>> I'm wondering if we could create a git hook to automatically run this
>> (or astyle, or other autoformatting tool) on every commit before the
>> commit goes through.  Does anyone have experience with git hooks?  I
>> have not ever used hooks with any SCM tool but wonder if this could
>> solve a problem here.
>>
>> On Sat, Jul 20, 2013 at 6:17 AM,   wrote:
>>>> So that basically means 4 spaces for the first indent 2 from then on and
>>>> don't indent comments?
>>>
>>> The c-block-comments-indent-p can be ignored -- obsolete and I had not
>>> actually removed it.
>>>
>>> and no tabs (as there is disagreement as what it means), 85 char line
>>> maximum (not everyone has super-wide screens or good eyesight).
>>>
>>> Personally I also really dislike lack of space after keywords like if and
>>> for, and lots of blank lines.
>>>
>>>>
>>>> Cheers,
>>>> Andrés
>>>>
>>>>
>>>> On Fri, Jul 19, 2013 at 11:45 AM, john ffitch  wrote:
>>>>
>>>>> > Is the formatting script in git?
>>>>>
>>>>> longline.c is the source of the reporter
>>>>>
>>>>> Formatting in emacs
>>>>>          (c-set-offset 'defun-block-intro 4)
>>>>>          (setq c-block-comments-indent-p nil)
>>>>>          (setq c-basic-offset 2)
>>>>>
>>>>> ==John ffitch
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> See everything from the browser to the database with AppDynamics
>>>>> Get end-to-end visibility with application monitoring from AppDynamics
>>>>> Isolate bottlenecks and diagnose root cause in seconds.
>>>>> Start your free trial of AppDynamics Pro today!
>>>>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
>>>>> _______________________________________________
>>>>> Csound-devel mailing list
>>>>> Csound-devel@lists.sourceforge.net
>>>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>>>>
>>>> ------------------------------------------------------------------------------
>>>> See everything from the browser to the database with AppDynamics
>>>> Get end-to-end visibility with application monitoring from AppDynamics
>>>> Isolate bottlenecks and diagnose root cause in seconds.
>>>> Start your free trial of AppDynamics Pro today!
>>>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk_______________________________________________
>>>> Csound-devel mailing list
>>>> Csound-devel@lists.sourceforge.net
>>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>>>
>>>
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> See everything from the browser to the database with AppDynamics
>>> Get end-to-end visibility with application monitoring from AppDynamics
>>> Isolate bottlenecks and diagnose root cause in seconds.
>>> Start your free trial of AppDynamics Pro today!
>>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
>>> _______________________________________________
>>> Csound-devel mailing list
>>> Csound-devel@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>
>> ------------------------------------------------------------------------------
>> See everything from the browser to the database with AppDynamics
>> Get end-to-end visibility with application monitoring from AppDynamics
>> Isolate bottlenecks and diagnose root cause in seconds.
>> Start your free trial of AppDynamics Pro today!
>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
>> _______________________________________________
>> Csound-devel mailing list
>> Csound-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>
>
>
> --
>
> Saludos,
> Felipe Sateler
>
> ------------------------------------------------------------------------------
> See everything from the browser to the database with AppDynamics
> Get end-to-end visibility with application monitoring from AppDynamics
> Isolate bottlenecks and diagnose root cause in seconds.
> Start your free trial of AppDynamics Pro today!
> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel

------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

I've gone through the history a little bit, and so far in every merge
I've seen John seems to have correctly merged the branches. So, other
than a weird commit message, it is not evident in the history that
there was actually a problem. So I'm a bit at a loss here on what
could be going wrong.



On Wed, Jul 24, 2013 at 7:00 AM, Steven Yi  wrote:
> I guess then that could work out just fine if we can use the tool to
> check to also be the tool to format.  It'd be an additional
> requirement for csound development though, so another barrier to
> entry. I don't know if this would help John's situation with strange
> merge errors though.
>
> On Tue, Jul 23, 2013 at 9:16 AM, Felipe Sateler  wrote:
>> You certainly can forbid commits that fail a certain command (ie, you
>> can check if a source file complies with the style, and if not refuse
>> to commit). I'm not sure it is possible to modify the file being
>> commited.
>>
>> On Tue, Jul 23, 2013 at 1:55 AM, Steven Yi  wrote:
>>> I'm wondering if we could create a git hook to automatically run this
>>> (or astyle, or other autoformatting tool) on every commit before the
>>> commit goes through.  Does anyone have experience with git hooks?  I
>>> have not ever used hooks with any SCM tool but wonder if this could
>>> solve a problem here.
>>>
>>> On Sat, Jul 20, 2013 at 6:17 AM,   wrote:
>>>>> So that basically means 4 spaces for the first indent 2 from then on and
>>>>> don't indent comments?
>>>>
>>>> The c-block-comments-indent-p can be ignored -- obsolete and I had not
>>>> actually removed it.
>>>>
>>>> and no tabs (as there is disagreement as what it means), 85 char line
>>>> maximum (not everyone has super-wide screens or good eyesight).
>>>>
>>>> Personally I also really dislike lack of space after keywords like if and
>>>> for, and lots of blank lines.
>>>>
>>>>>
>>>>> Cheers,
>>>>> Andrés
>>>>>
>>>>>
>>>>> On Fri, Jul 19, 2013 at 11:45 AM, john ffitch  wrote:
>>>>>
>>>>>> > Is the formatting script in git?
>>>>>>
>>>>>> longline.c is the source of the reporter
>>>>>>
>>>>>> Formatting in emacs
>>>>>>          (c-set-offset 'defun-block-intro 4)
>>>>>>          (setq c-block-comments-indent-p nil)
>>>>>>          (setq c-basic-offset 2)
>>>>>>
>>>>>> ==John ffitch
>>>>>>
>>>>>>
>>>>>> ------------------------------------------------------------------------------
>>>>>> See everything from the browser to the database with AppDynamics
>>>>>> Get end-to-end visibility with application monitoring from AppDynamics
>>>>>> Isolate bottlenecks and diagnose root cause in seconds.
>>>>>> Start your free trial of AppDynamics Pro today!
>>>>>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
>>>>>> _______________________________________________
>>>>>> Csound-devel mailing list
>>>>>> Csound-devel@lists.sourceforge.net
>>>>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> See everything from the browser to the database with AppDynamics
>>>>> Get end-to-end visibility with application monitoring from AppDynamics
>>>>> Isolate bottlenecks and diagnose root cause in seconds.
>>>>> Start your free trial of AppDynamics Pro today!
>>>>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk_______________________________________________
>>>>> Csound-devel mailing list
>>>>> Csound-devel@lists.sourceforge.net
>>>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>>>>
>>>>
>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> See everything from the browser to the database with AppDynamics
>>>> Get end-to-end visibility with application monitoring from AppDynamics
>>>> Isolate bottlenecks and diagnose root cause in seconds.
>>>> Start your free trial of AppDynamics Pro today!
>>>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
>>>> _______________________________________________
>>>> Csound-devel mailing list
>>>> Csound-devel@lists.sourceforge.net
>>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>>
>>> ------------------------------------------------------------------------------
>>> See everything from the browser to the database with AppDynamics
>>> Get end-to-end visibility with application monitoring from AppDynamics
>>> Isolate bottlenecks and diagnose root cause in seconds.
>>> Start your free trial of AppDynamics Pro today!
>>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
>>> _______________________________________________
>>> Csound-devel mailing list
>>> Csound-devel@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>
>>
>>
>> --
>>
>> Saludos,
>> Felipe Sateler
>>
>> ------------------------------------------------------------------------------
>> See everything from the browser to the database with AppDynamics
>> Get end-to-end visibility with application monitoring from AppDynamics
>> Isolate bottlenecks and diagnose root cause in seconds.
>> Start your free trial of AppDynamics Pro today!
>> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
>> _______________________________________________
>> Csound-devel mailing list
>> Csound-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>
> ------------------------------------------------------------------------------
> See everything from the browser to the database with AppDynamics
> Get end-to-end visibility with application monitoring from AppDynamics
> Isolate bottlenecks and diagnose root cause in seconds.
> Start your free trial of AppDynamics Pro today!
> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel



-- 

Saludos,
Felipe Sateler

------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/