Re: [frogs] Patch for Issue #830

2009-12-22 Thread Trevor Daniels
ily-Devel List" ; Sent: Tuesday, December 22, 2009 2:26 PM Subject: Re: [frogs] Patch for Issue #830 On 12/22/09 5:48 AM, "James Lowe" wrote: Carl, Carl Sorensen wrote: We have now put a new script in scripts/auxiliar/ that will strip trailing whitespace. After y

Re: [frogs] Patch for Issue #830

2009-12-22 Thread Graham Percival
On Tue, Dec 22, 2009 at 3:30 PM, Mark Polesky wrote: > Carl Sorensen wrote: >> Mark, Graham tried to get you interested in taking over >> lilycontrib.tcl.  Are you interested? > > Well, I was avoiding it because it's written in yet another > scripting language that I don't know. No worries. Just

Re: [frogs] Patch for Issue #830

2009-12-22 Thread Mark Polesky
Carl Sorensen wrote: > Mark, Graham tried to get you interested in taking over > lilycontrib.tcl. Are you interested? Well, I was avoiding it because it's written in yet another scripting language that I don't know. Am I being obtuse, do you think? I'm currently working on reorganizing the CG a

Re: [frogs] Patch for Issue #830

2009-12-22 Thread Carl Sorensen
On 12/22/09 5:48 AM, "James Lowe" wrote: > Carl, > > Carl Sorensen wrote: > >> >> We have now put a new script in scripts/auxiliar/ that will strip trailing >> whitespace. >> >> After you're done editing a file, just enter the following from a command >> prompt: >> >> ... > > Thanks for

Re: [frogs] Patch for Issue #830

2009-12-21 Thread Graham Percival
On Mon, Dec 21, 2009 at 02:10:15PM -0800, Mark Polesky wrote: > Marc Hohl wrote: > > I found something useful here: > > http://code.google.com/p/pymc/issues/detail?id=230 > > > > The program is simple but seems to work: > > Why not use a sed one-liner? Because not all OSes have sed. And even th

Re: [frogs] Patch for Issue #830

2009-12-21 Thread Mark Polesky
Marc Hohl wrote: > I found something useful here: > http://code.google.com/p/pymc/issues/detail?id=230 > > The program is simple but seems to work: Why not use a sed one-liner? sed -i 's/[ \t]*$//' filename * $ echo -e "Trailing spaces: \nTrailing tabs:\t\t" > ws-test $ cat -A ws-test Tr

Re: [frogs] Patch for Issue #830

2009-12-21 Thread Carl Sorensen
On 12/20/09 1:57 PM, "James Lowe" wrote: >> One recommendation: every time you modify a source file, run >> a macro or something to trim the trailing whitespaces > As someone who wouldn't know what to run and who does get this occasionally in > doc patches I push, can someone give me some advi

Re: [frogs] Patch for Issue #830

2009-12-21 Thread Trevor Daniels
Reinhold, you wrote Monday, December 21, 2009 4:37 PM Please note the ^ in the command, which means the commit **before** HEAD, so this command takes all commits since HEAD-1 (i.e. it takes only the last patch) and corrects all trailing whitespace in it. You're right - I'd missed that. Th

Removing trailing whitespace [was Re: [frogs] Patch for Issue #830]

2009-12-21 Thread Trevor Daniels
Carl Sorensen wrote Monday, December 21, 2009 4:41 PM On 12/21/09 9:11 AM, "Trevor Daniels" wrote: Carl Sorensen wrote" so you can do git rebase --whitespace=fix HEAD^ Hhm. I don't think this works. The whitespace option is simply passed to apply for actioning, but in this case appl

Re: [frogs] Patch for Issue #830

2009-12-21 Thread Graham Percival
On Sun, Dec 20, 2009 at 9:33 PM, Marc Hohl wrote: > Graham Percival schrieb: >> >> There's some git command that removes whitespaces at the end of >> lines.  There's also a tracker issue to find a command (ideally >> with python, maybe?) that removes those whitespaces.  Either it's >> a hard issue

Re: [frogs] Patch for Issue #830

2009-12-21 Thread Reinhold Kainhofer
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Am Montag, 21. Dezember 2009 17:11:54 schrieb Trevor Daniels: > Carl Sorensen wrote" > > so you can do > > > > git rebase --whitespace=fix HEAD^ > > Hhm. I don't think this works. > > The whitespace option is simply passed to apply > for actioning,

Re: [frogs] Patch for Issue #830

2009-12-21 Thread Trevor Daniels
Carl Sorensen wrote" On 12/21/09 8:08 AM, "Trevor Daniels" wrote: As far as I know it can't. The rebase command rebases one git branch on another, so you have to be using branches to take advantage of it. Rebase combines all the changes between two different git commits into a single

Re: [frogs] Patch for Issue #830

2009-12-21 Thread Carl Sorensen
On 12/21/09 8:51 AM, "Trevor Daniels" wrote: > > > Graham Percival wrote Monday, December 21, 2009 3:18 PM > > >> On Mon, Dec 21, 2009 at 3:08 PM, Trevor Daniels >> wrote: >>> >>> Graham Percival wrote Monday, December 21, 2009 2:46 PM >>> >>> git rebase --whitespace=fix master mymo

Re: [frogs] Patch for Issue #830

2009-12-21 Thread Trevor Daniels
Graham Percival wrote Monday, December 21, 2009 3:18 PM On Mon, Dec 21, 2009 at 3:08 PM, Trevor Daniels wrote: Graham Percival wrote Monday, December 21, 2009 2:46 PM git rebase --whitespace=fix master mymods If git can be configured to automatically fix whitespaces, then I'll copy&pas

Re: [frogs] Patch for Issue #830

2009-12-21 Thread Carl Sorensen
On 12/21/09 8:08 AM, "Trevor Daniels" wrote: > > > Graham Percival wrote Monday, December 21, 2009 2:46 PM > > >> On Mon, Dec 21, 2009 at 12:56:51AM -, Trevor Daniels wrote: >>> >>> Graham Percival wrote Sunday, December 20, 2009 11:13 PM >>> > git rebase --whitespace=fix master

Re: [frogs] Patch for Issue #830

2009-12-21 Thread Graham Percival
On Mon, Dec 21, 2009 at 3:08 PM, Trevor Daniels wrote: > > Graham Percival wrote Monday, December 21, 2009 2:46 PM > > git rebase --whitespace=fix master mymods >> If git >> can be configured to automatically fix whitespaces, then I'll >> copy&paste the command and then stop pushing commi

Re: [frogs] Patch for Issue #830

2009-12-21 Thread Trevor Daniels
Graham Percival wrote Monday, December 21, 2009 2:46 PM On Mon, Dec 21, 2009 at 12:56:51AM -, Trevor Daniels wrote: Graham Percival wrote Sunday, December 20, 2009 11:13 PM git rebase --whitespace=fix master mymods Can that be written as a universal preference? and added to CG 1.1?

Re: [frogs] Patch for Issue #830

2009-12-21 Thread Graham Percival
On Mon, Dec 21, 2009 at 12:56:51AM -, Trevor Daniels wrote: > > Graham Percival wrote Sunday, December 20, 2009 11:13 PM > >>> git rebase --whitespace=fix master mymods >> >> Can that be written as a universal preference? and added to CG >> 1.1? (I think it's that section; it might have moved

Re: [frogs] Patch for Issue #830

2009-12-21 Thread Trevor Daniels
Mark Polesky wrote Monday, December 21, 2009 1:42 AM Trevor Daniels wrote: Actually, I don't think rebase is mentioned in the CG. I can't see it on a quick trawl. It should be, as a branch should be rebased before a patch is generated from it if master has been updated since the branch was

Re: [frogs] Patch for Issue #830

2009-12-20 Thread Mark Polesky
Trevor Daniels wrote: > Actually, I don't think rebase is mentioned in the CG. I > can't see it on a quick trawl. It should be, as a branch > should be rebased before a patch is generated from it if > master has been updated since the branch was created, else > inadvertent reverts might be includ

Re: [frogs] Patch for Issue #830

2009-12-20 Thread Trevor Daniels
Graham Percival wrote Sunday, December 20, 2009 11:13 PM On Sun, Dec 20, 2009 at 11:05:27PM -, Trevor Daniels wrote: git rebase --whitespace=fix master mymods Can that be written as a universal preference? and added to CG 1.1? (I think it's that section; it might have moved) This i

Re: [frogs] Patch for Issue #830

2009-12-20 Thread Graham Percival
On Sun, Dec 20, 2009 at 11:05:27PM -, Trevor Daniels wrote: > > git rebase --whitespace=fix master mymods Can that be written as a universal preference? and added to CG 1.1? (I think it's that section; it might have moved) Cheers, - Graham ___ l

Re: [frogs] Patch for Issue #830

2009-12-20 Thread Trevor Daniels
Graham Percival wrote Sunday, December 20, 2009 9:01 PM There's some git command that removes whitespaces at the end of lines. Yes, it's git rebase. That has a --whitespace=fix option. So if your mods are in branch mymods, say, just enter git rebase --whitespace=fix master mymods You'll n

Re: [frogs] Patch for Issue #830

2009-12-20 Thread Marc Hohl
git when it makes the patch than anything else. regards James -- From: Marc Hohl Sent: Sun 20/12/2009 20:53 To: Mark Polesky Cc: Neil Puttock; Carl Sorensen; Lily-Devel List; fr...@lilynet.net

Re: [frogs] Patch for Issue #830

2009-12-20 Thread Graham Percival
- > >From: Marc Hohl >Sent: Sun 20/12/2009 20:53 >To: Mark Polesky > Cc: Neil Puttock; Carl Sorensen; Lily-Devel List; fr...@lilynet.net >Subject: Re: [frogs] Patch for Issue #830 > > Mark Polesky schrieb: > > Marc Hohl wrote: > >

Re: [frogs] Patch for Issue #830

2009-12-20 Thread Marc Hohl
Mark Polesky schrieb: Marc Hohl wrote: I have renamed the feta-*.mf files accordingly (see issue #830). I did make clean make all and didn't get any errors. Ok to apply? I don't see any problems looking at the patch, but that doesn't mean there aren't any. I'll let Neil or Carl wei

Re: [frogs] Patch for Issue #830

2009-12-20 Thread Mark Polesky
Marc Hohl wrote: > I have renamed the feta-*.mf files accordingly (see issue > #830). I did > > make clean > make all > > and didn't get any errors. Ok to apply? I don't see any problems looking at the patch, but that doesn't mean there aren't any. I'll let Neil or Carl weigh in here. One recom

Re: [frogs] Patch for Issue #830

2009-12-20 Thread Marc Hohl
Neil Puttock schrieb: 2009/12/20 Carl Sorensen : I think I'd like to recommend that in the future, instead of emailing patches (with the associated problems with line endings), we just have Frogs post them on Rietveld. I'd also recommend at least checking a snippet runs properly (if n

Re: [frogs] Patch for Issue #830

2009-12-20 Thread Marc Hohl
Carl Sorensen schrieb: On 12/19/09 1:07 PM, "Marc Hohl" wrote: Hi all, I have renamed the feta-*.mf files accordingly (see issue #830). I did make clean make all and didn't get any errors. Ok to apply? I will check this later today. I think I'd like to recommend that in the futu

Re: [frogs] Patch for Issue #830

2009-12-20 Thread Neil Puttock
2009/12/20 Carl Sorensen : > I think I'd like to recommend that in the future, instead of emailing > patches (with the associated problems with line endings), we just have Frogs > post them on Rietveld. I'd also recommend at least checking a snippet runs properly (if not doing a regression test c

Re: [frogs] Patch for Issue #830

2009-12-20 Thread Carl Sorensen
On 12/19/09 1:07 PM, "Marc Hohl" wrote: > Hi all, > > I have renamed the feta-*.mf files accordingly (see issue #830). > I did > > make clean > make all > > and didn't get any errors. Ok to apply? I will check this later today. I think I'd like to recommend that in the future, instead of