Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-29 Thread Junio C Hamano
Petr Baudis <[EMAIL PROTECTED]> writes: > Dear diary, on Fri, Jul 29, 2005 at 11:55:52AM CEST, I got a letter > where Catalin Marinas <[EMAIL PROTECTED]> told me that... >> Petr Baudis <[EMAIL PROTECTED]> wrote: >> > The committer field generally identifies the committer "physically", and >> > isn

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-29 Thread Catalin Marinas
Petr Baudis <[EMAIL PROTECTED]> wrote: > Dear diary, on Fri, Jul 29, 2005 at 11:55:52AM CEST, I got a letter > where Catalin Marinas <[EMAIL PROTECTED]> told me that... >> The latest StGIT snapshot uses, by default, the committer's details >> for the From: line when sending patches by e-mail, assum

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-29 Thread Petr Baudis
Dear diary, on Fri, Jul 29, 2005 at 11:55:52AM CEST, I got a letter where Catalin Marinas <[EMAIL PROTECTED]> told me that... > Petr Baudis <[EMAIL PROTECTED]> wrote: > > The committer field generally identifies the committer "physically", and > > isn't usually overriden. You'll find <[EMAIL PROTEC

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-29 Thread Catalin Marinas
Petr Baudis <[EMAIL PROTECTED]> wrote: > The committer field generally identifies the committer "physically", and > isn't usually overriden. You'll find <[EMAIL PROTECTED]> in my > committer field, e.g. I thought GIT_COMMITTER_{NAME,EMAIL} were added to be able to override the defaults like [EMAIL

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-28 Thread Linus Torvalds
On Thu, 28 Jul 2005, Junio C Hamano wrote: > > I do not want to get involved in policy decisions, but for the > record I always hated your commit log for that "identifies the > committer physically" approach. Well, I have to say that I find it quite useful myself. I try to commit x86 patches to

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-28 Thread Junio C Hamano
Petr Baudis <[EMAIL PROTECTED]> writes: > The committer field generally identifies the committer "physically", and > isn't usually overriden. You'll find <[EMAIL PROTECTED]> in my > committer field, e.g. I do not want to get involved in policy decisions, but for the record I always hated your com

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-28 Thread Petr Baudis
Dear diary, on Sat, Jul 23, 2005 at 12:27:31PM CEST, I got a letter where Catalin Marinas <[EMAIL PROTECTED]> told me that... > > Agreed. What Cogito uses: > > > > .git/author Default author information in format > > Person Name <[EMAIL PROTECTED]> > > What abo

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-23 Thread Junio C Hamano
Petr Baudis <[EMAIL PROTECTED]> writes: > I have it the other way around, with the rationale that your default > settings should be in your ~/.gitrc, not environment, which is always > the highest priority. That's true. I just never hand commit other people's patches (I use applymbox for that) a

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-23 Thread Catalin Marinas
On Sat, 2005-07-23 at 12:33 -0400, Bryan Larsen wrote: > how about: > .git/refs/heads/master - documented in README, doesn't appear to be used. That's true, README is quite outdated. I created the http://wiki.procode.org/cgi-bin/wiki.cgi/StGIT page (empty now) where I will add StGIT information

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-23 Thread Bryan Larsen
Catalin Marinas wrote: It seems I inadvertantly kicked off the discussion I wanted to kick off, but I didn't excpect this patch to do so! I prepared a patch adding the following information into git/Documentation to kick off discussion. Obviously Catalin is more likely to be accurate. O

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-23 Thread Catalin Marinas
On Fri, 2005-07-22 at 16:24 -0700, Junio C Hamano wrote: > Petr Baudis <[EMAIL PROTECTED]> writes: > > This brings me to another subject, M and N are pretty hard to > > distinguish visually without close inspection of the output. What about > > switching to use A instead of N everywhere? > > Howev

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-23 Thread Catalin Marinas
On Sat, 2005-07-23 at 11:30 +0200, Petr Baudis wrote: > Dear diary, on Sat, Jul 23, 2005 at 10:41:38AM CEST, I got a letter > where Catalin Marinas <[EMAIL PROTECTED]> told me that... > > The problem appears when one upstream maintainer changes the > > configuration, should this be merged again? In

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-23 Thread Petr Baudis
Dear diary, on Sat, Jul 23, 2005 at 10:41:38AM CEST, I got a letter where Catalin Marinas <[EMAIL PROTECTED]> told me that... > Another problem with the template is when one wants a header as well as > footer (for things like '-*- mode: text; -*-'). Maybe something like > below would work: > > GIT

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-23 Thread Petr Baudis
Dear diary, on Sat, Jul 23, 2005 at 01:07:05AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > Catalin Marinas <[EMAIL PROTECTED]> writes: > > > Would such a template only have 'GIT:' prefixed lines? I usually put > > another line like 'Signed-off-by:', for convenie

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-23 Thread Catalin Marinas
On Fri, 2005-07-22 at 16:07 -0700, Junio C Hamano wrote: > Catalin Marinas <[EMAIL PROTECTED]> writes: > > If signed-off-by is the only thing you are worried about, how > about making it not part of the commit template and the message > user touches with the editor? You first look at the user > co

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-22 Thread Petr Baudis
Dear diary, on Sat, Jul 23, 2005 at 01:24:35AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > Petr Baudis <[EMAIL PROTECTED]> writes: > > > Cogito shows '[NMD] filename' in place of @[EMAIL PROTECTED] > > Sounds sensible. Does it parse it to limit the files to be

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-22 Thread Junio C Hamano
Petr Baudis <[EMAIL PROTECTED]> writes: > Cogito shows '[NMD] filename' in place of @[EMAIL PROTECTED] Sounds sensible. Does it parse it to limit the files to be committed? > This brings me to another subject, M and N are pretty hard to > distinguish visually without close inspection of the out

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-22 Thread Junio C Hamano
Catalin Marinas <[EMAIL PROTECTED]> writes: > Would such a template only have 'GIT:' prefixed lines? I usually put > another line like 'Signed-off-by:', for convenience. The problem with > StGIT appears when one wants to re-edit the patch description (stg > refresh -e), in which case the existing

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-22 Thread Catalin Marinas
On Fri, 2005-07-22 at 13:39 -0700, Junio C Hamano wrote: > I would like to see Porcelains stay compatible when the do not > have to differ. The commit template [*2*] is one example of > such. For StGIT it is not a problem to use any commit template with any prefix. It doesn't generate extra lin

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-22 Thread Petr Baudis
Dear diary, on Fri, Jul 22, 2005 at 11:16:51PM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > Wonderful start. > > Later on, Porcelains could agree on what @TOKEN@ are generally > available, and even start using a common script to pre-fill the > templates, like: >

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-22 Thread Junio C Hamano
Wonderful start. Later on, Porcelains could agree on what @TOKEN@ are generally available, and even start using a common script to pre-fill the templates, like: $ git-fill-template-script var=val var=val... In your example, I see AUTHOR_NAME, AUTHOR_EMAIL, and AUTHOR_DATE (I'd use GIT_AUTHOR

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-22 Thread Petr Baudis
Dear diary, on Fri, Jul 22, 2005 at 10:39:06PM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > Porcelains need to agree on what is placed where and used in > what way. Yes, I always try to make things as Cogito-unspecific as possible. > - Per user. A user may wa

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-22 Thread Catalin Marinas
On Fri, 2005-07-22 at 19:24 +, Sam Ravnborg wrote: > > I would use a neutral commit template, only that it should have a > > neutral prefix as well for the lines to be removed (neither STG nor CG > > but GIT maybe). The $GIT_DIR/commit-template is fine as a file name. > > How about $GIT_DIR/co

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-22 Thread Petr Baudis
Dear diary, on Fri, Jul 22, 2005 at 12:37:05PM CEST, I got a letter where Catalin Marinas <[EMAIL PROTECTED]> told me that... > > Cogito seems to use $GIT_DIR/commit-template for that purpose. > > Can't users put that "vim:" hint there, and if StGIT does not > > use a commit template, patch it to u

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-22 Thread Junio C Hamano
Sam Ravnborg <[EMAIL PROTECTED]> writes: >> I would use a neutral commit template, only that it should have a >> neutral prefix as well for the lines to be removed (neither STG nor CG >> but GIT maybe). The $GIT_DIR/commit-template is fine as a file name. > > How about $GIT_DIR/commit-template-`ba

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-22 Thread Sam Ravnborg
> > I would use a neutral commit template, only that it should have a > neutral prefix as well for the lines to be removed (neither STG nor CG > but GIT maybe). The $GIT_DIR/commit-template is fine as a file name. How about $GIT_DIR/commit-template-`basename $EDITOR` Then we could have different

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-22 Thread Catalin Marinas
Junio C Hamano <[EMAIL PROTECTED]> wrote: > I do not do Porcelain, but wouldn't it be nicer if we had a > Porcelain neutral "commit log template file" under $GIT_DIR > somewhere? 'vim: textwidth=75' is completely useless for > somebody like me (I almost always work inside Emacs). StGIT uses .git/

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-21 Thread Junio C Hamano
I do not do Porcelain, but wouldn't it be nicer if we had a Porcelain neutral "commit log template file" under $GIT_DIR somewhere? 'vim: textwidth=75' is completely useless for somebody like me (I almost always work inside Emacs). Cogito seems to use $GIT_DIR/commit-template for that purpose. Can

[PATCH 1/1] Tell vim the textwidth is 75.

2005-07-21 Thread Bryan larsen
When invoking EDITOR, add some metadata to tell vim the textwidth is 75. Signed-off-by: Bryan Larsen <[EMAIL PROTECTED]> --- stgit/stack.py |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/stgit/stack.py b/stgit/stack.py --- a/stgit/stack.py +++ b/stgit/stack.py @@ -66,6