From: Petr Baudis <pasky@ucw.cz>
Date: Sun, 08 May 2005 21:08:58 GMT
Subject: Re: [PATCH Cogito] Make use of external editor work like CVS
Message-ID: <20050508210857.GL9495@pasky.ji.cz>
In-Reply-To: <1115584015.8949.43.camel@pegasus>

Dear diary, on Sun, May 08, 2005 at 10:26:55PM CEST, I got a letter
where Marcel Holtmann <marcel@holtmann.org> told me that...
> Hi Petr,

Hi,

> > > look at the attached patch. We should use "fmt -s" to keep newlines that
> > > are inside the commit message and there is one unneeded empty CG: line.
> > 
> > thanks, fixed and pushed out.
> 
> cool. Now I have everything I am used to from CVS, but ...

Excellent.

> @@ -113,7 +113,9 @@
>                 # TODO: Prepend a letter describing whether it's addition,
>                 # removal or update. Or call git status on those files.
>                 echo "CG:    $file" >>$LOGMSG
> -               [ "$msgs" ] && echo $file
> +               if [ "$msgs" ] && ! [ "$forceeditor" ]; then
> +                       echo $file
> +               fi
>         done
>  fi
> 
> There is no need to print out the files if we start the editor anyway.

Thanks, fixed.

> @@ -122,10 +124,10 @@
>  if tty -s; then
>         if ! [ "$msgs" ] || [ "$forceeditor" ]; then
>                 ${EDITOR:-vi} $LOGMSG2
> -       fi
> -       if ! [ "$msgs" ] && ! [ $LOGMSG2 -nt $LOGMSG ]; then
> -               rm $LOGMSG $LOGMSG2
> -               die 'Commit message not modified, commit aborted'
> +               if ! [ $LOGMSG2 -nt $LOGMSG ]; then
> +                       rm $LOGMSG $LOGMSG2
> +                       die 'Commit message not modified, commit aborted'
> +               fi
>         fi
>  else
> 
> If you provide a commit message via -m and then close the editor without
> changing it, it will commit the message. I think that will not be the
> intention of the user.

Now, this is a pretty difficult question. The only other place in the
Cogito toolkit which uses cg-commit -e is now cg-init when doing the
initial commit - and you definitively want to commit even if the message
was not modified in that case. Also, what if you want to just review
how the -m stuff flows like before committing?

OTOH, we might want to stay consistent in behaviour and always abandon
action when the file was not modified (except for the initial commit).
Perhaps some -E for that? Other thoughts?

> /*
>  * Remove empty lines from the beginning and end.
>  *
>  * Turn multiple consecutive empty lines into just one
>  * empty line.
>  */

Bah, that's even easier when you want to squeeze the empty lines inside
of the commit message. I don't, though.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor