[PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

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

2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
> Could we put a limit to the commit log entry? More than 500 hundred
> lines changelog entries should just be rejected and this will avoid
> someone accidentally committing a full log or a diff or just random
> junk.
>

The following patch to our pre-commit hook enables this. I have tested
it with a dummy repository but review from bourne-shell and/or
subversion knowledgeable people would be welcome.

Who can approve this?

Cheers,

Manuel.

[-- Attachment #2: pre-commit.diff --]
[-- Type: text/plain, Size: 1723 bytes --]

Index: pre-commit
===================================================================
--- pre-commit	(revision 139590)
+++ pre-commit	(working copy)
@@ -47,7 +47,8 @@
 # If you're having unexpected problems with a hook program, the
 # culprit may be unusual (or missing) environment variables.
 # 
-# Here is an example hook script, for a Unix /bin/sh interpreter.# For more examples and pre-written hooks, see those in
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
 # the Subversion repository at
 # http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
 # http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
@@ -58,9 +59,23 @@
 
 # Make sure that the log message contains some text.
 SVNLOOK=/usr/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPOS" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
 
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "[a-zA-Z0-9]" > /dev/null
+if [ $? -ne 0 ]; then
+    echo "Please include a ChangeLog entry with this commit." >&2
+    exit 1
+fi
+
+# Do not allow log messages
+LOGLINES=`$SVNLOOK log -t "$TXN" "$REPOS" | wc -l`
+if test $LOGLINES -gt 500; then
+    echo "A single ChangeLog entry cannot be larger than 500 lines.       " >&2
+    echo "Please check again the log message of this commit.              " >&2
+    echo "If you are merging from/to a branch, never use log messages from" >&2
+    echo "other revisions as the commit message.                          " >&2
+    exit 1
+fi
+
 # Check that the author of this commit has the rights to perform
 # the commit on the files and directories being modified.
 #commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1

[PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

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

2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
> Could we put a limit to the commit log entry? More than 500 hundred
> lines changelog entries should just be rejected and this will avoid
> someone accidentally committing a full log or a diff or just random
> junk.
>

The following patch to our pre-commit hook enables this. I have tested
it with a dummy repository but review from bourne-shell and/or
subversion knowledgeable people would be welcome.

Who can approve this?

Cheers,

Manuel.

[-- Attachment #2: pre-commit.diff --]
[-- Type: text/plain, Size: 1723 bytes --]

Index: pre-commit
===================================================================
--- pre-commit	(revision 139590)
+++ pre-commit	(working copy)
@@ -47,7 +47,8 @@
 # If you're having unexpected problems with a hook program, the
 # culprit may be unusual (or missing) environment variables.
 # 
-# Here is an example hook script, for a Unix /bin/sh interpreter.# For more examples and pre-written hooks, see those in
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
 # the Subversion repository at
 # http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
 # http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
@@ -58,9 +59,23 @@
 
 # Make sure that the log message contains some text.
 SVNLOOK=/usr/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPOS" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
 
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "[a-zA-Z0-9]" > /dev/null
+if [ $? -ne 0 ]; then
+    echo "Please include a ChangeLog entry with this commit." >&2
+    exit 1
+fi
+
+# Do not allow log messages
+LOGLINES=`$SVNLOOK log -t "$TXN" "$REPOS" | wc -l`
+if test $LOGLINES -gt 500; then
+    echo "A single ChangeLog entry cannot be larger than 500 lines.       " >&2
+    echo "Please check again the log message of this commit.              " >&2
+    echo "If you are merging from/to a branch, never use log messages from" >&2
+    echo "other revisions as the commit message.                          " >&2
+    exit 1
+fi
+
 # Check that the author of this commit has the rights to perform
 # the commit on the files and directories being modified.
 #commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1

[PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

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

2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
> Could we put a limit to the commit log entry? More than 500 hundred
> lines changelog entries should just be rejected and this will avoid
> someone accidentally committing a full log or a diff or just random
> junk.
>

The following patch to our pre-commit hook enables this. I have tested
it with a dummy repository but review from bourne-shell and/or
subversion knowledgeable people would be welcome.

Who can approve this?

Cheers,

Manuel.

[-- Attachment #2: pre-commit.diff --]
[-- Type: text/plain, Size: 1723 bytes --]

Index: pre-commit
===================================================================
--- pre-commit	(revision 139590)
+++ pre-commit	(working copy)
@@ -47,7 +47,8 @@
 # If you're having unexpected problems with a hook program, the
 # culprit may be unusual (or missing) environment variables.
 # 
-# Here is an example hook script, for a Unix /bin/sh interpreter.# For more examples and pre-written hooks, see those in
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
 # the Subversion repository at
 # http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
 # http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
@@ -58,9 +59,23 @@
 
 # Make sure that the log message contains some text.
 SVNLOOK=/usr/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPOS" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
 
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "[a-zA-Z0-9]" > /dev/null
+if [ $? -ne 0 ]; then
+    echo "Please include a ChangeLog entry with this commit." >&2
+    exit 1
+fi
+
+# Do not allow log messages
+LOGLINES=`$SVNLOOK log -t "$TXN" "$REPOS" | wc -l`
+if test $LOGLINES -gt 500; then
+    echo "A single ChangeLog entry cannot be larger than 500 lines.       " >&2
+    echo "Please check again the log message of this commit.              " >&2
+    echo "If you are merging from/to a branch, never use log messages from" >&2
+    echo "other revisions as the commit message.                          " >&2
+    exit 1
+fi
+
 # Check that the author of this commit has the rights to perform
 # the commit on the files and directories being modified.
 #commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>> Could we put a limit to the commit log entry? More than 500 hundred
>> lines changelog entries should just be rejected and this will avoid
>> someone accidentally committing a full log or a diff or just random
>> junk.
>>
>
> The following patch to our pre-commit hook enables this. I have tested
> it with a dummy repository but review from bourne-shell and/or
> subversion knowledgeable people would be welcome.
>

When I add 600 testcases, should I mention each of them in commit log?

-- 
H.J.

[PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

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

2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
> Could we put a limit to the commit log entry? More than 500 hundred
> lines changelog entries should just be rejected and this will avoid
> someone accidentally committing a full log or a diff or just random
> junk.
>

The following patch to our pre-commit hook enables this. I have tested
it with a dummy repository but review from bourne-shell and/or
subversion knowledgeable people would be welcome.

Who can approve this?

Cheers,

Manuel.

[-- Attachment #2: pre-commit.diff --]
[-- Type: text/plain, Size: 1723 bytes --]

Index: pre-commit
===================================================================
--- pre-commit	(revision 139590)
+++ pre-commit	(working copy)
@@ -47,7 +47,8 @@
 # If you're having unexpected problems with a hook program, the
 # culprit may be unusual (or missing) environment variables.
 # 
-# Here is an example hook script, for a Unix /bin/sh interpreter.# For more examples and pre-written hooks, see those in
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
 # the Subversion repository at
 # http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
 # http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
@@ -58,9 +59,23 @@
 
 # Make sure that the log message contains some text.
 SVNLOOK=/usr/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPOS" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
 
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "[a-zA-Z0-9]" > /dev/null
+if [ $? -ne 0 ]; then
+    echo "Please include a ChangeLog entry with this commit." >&2
+    exit 1
+fi
+
+# Do not allow log messages
+LOGLINES=`$SVNLOOK log -t "$TXN" "$REPOS" | wc -l`
+if test $LOGLINES -gt 500; then
+    echo "A single ChangeLog entry cannot be larger than 500 lines.       " >&2
+    echo "Please check again the log message of this commit.              " >&2
+    echo "If you are merging from/to a branch, never use log messages from" >&2
+    echo "other revisions as the commit message.                          " >&2
+    exit 1
+fi
+
 # Check that the author of this commit has the rights to perform
 # the commit on the files and directories being modified.
 #commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>> Could we put a limit to the commit log entry? More than 500 hundred
>> lines changelog entries should just be rejected and this will avoid
>> someone accidentally committing a full log or a diff or just random
>> junk.
>>
>
> The following patch to our pre-commit hook enables this. I have tested
> it with a dummy repository but review from bourne-shell and/or
> subversion knowledgeable people would be welcome.
>

When I add 600 testcases, should I mention each of them in commit log?

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Richard Guenther]

On Tue, Aug 26, 2008 at 5:06 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>>> Could we put a limit to the commit log entry? More than 500 hundred
>>> lines changelog entries should just be rejected and this will avoid
>>> someone accidentally committing a full log or a diff or just random
>>> junk.
>>>
>>
>> The following patch to our pre-commit hook enables this. I have tested
>> it with a dummy repository but review from bourne-shell and/or
>> subversion knowledgeable people would be welcome.
>>
>
> When I add 600 testcases, should I mention each of them in commit log?

Yes.

IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?

Richard.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>> Could we put a limit to the commit log entry? More than 500 hundred
>> lines changelog entries should just be rejected and this will avoid
>> someone accidentally committing a full log or a diff or just random
>> junk.
>>
>
> The following patch to our pre-commit hook enables this. I have tested
> it with a dummy repository but review from bourne-shell and/or
> subversion knowledgeable people would be welcome.
>

When I add 600 testcases, should I mention each of them in commit log?

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Richard Guenther]

On Tue, Aug 26, 2008 at 5:06 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>>> Could we put a limit to the commit log entry? More than 500 hundred
>>> lines changelog entries should just be rejected and this will avoid
>>> someone accidentally committing a full log or a diff or just random
>>> junk.
>>>
>>
>> The following patch to our pre-commit hook enables this. I have tested
>> it with a dummy repository but review from bourne-shell and/or
>> subversion knowledgeable people would be welcome.
>>
>
> When I add 600 testcases, should I mention each of them in commit log?

Yes.

IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?

Richard.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 8:36 AM, Richard Guenther
<richard.guenther@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 5:06 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>> On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
>> <lopezibanez@gmail.com> wrote:
>>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>>>> Could we put a limit to the commit log entry? More than 500 hundred
>>>> lines changelog entries should just be rejected and this will avoid
>>>> someone accidentally committing a full log or a diff or just random
>>>> junk.
>>>>
>>>
>>> The following patch to our pre-commit hook enables this. I have tested
>>> it with a dummy repository but review from bourne-shell and/or
>>> subversion knowledgeable people would be welcome.
>>>
>>
>> When I add 600 testcases, should I mention each of them in commit log?
>
> Yes.
>
> IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?
>

Shouldn't svnmerge be fixed not to generate such log?


-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 8:36 AM, Richard Guenther
<richard.guenther@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 5:06 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>> On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
>> <lopezibanez@gmail.com> wrote:
>>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>>>> Could we put a limit to the commit log entry? More than 500 hundred
>>>> lines changelog entries should just be rejected and this will avoid
>>>> someone accidentally committing a full log or a diff or just random
>>>> junk.
>>>>
>>>
>>> The following patch to our pre-commit hook enables this. I have tested
>>> it with a dummy repository but review from bourne-shell and/or
>>> subversion knowledgeable people would be welcome.
>>>
>>
>> When I add 600 testcases, should I mention each of them in commit log?
>
> Yes.
>
> IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?
>

Shouldn't svnmerge be fixed not to generate such log?


-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Richard Guenther]

On Tue, Aug 26, 2008 at 5:06 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>>> Could we put a limit to the commit log entry? More than 500 hundred
>>> lines changelog entries should just be rejected and this will avoid
>>> someone accidentally committing a full log or a diff or just random
>>> junk.
>>>
>>
>> The following patch to our pre-commit hook enables this. I have tested
>> it with a dummy repository but review from bourne-shell and/or
>> subversion knowledgeable people would be welcome.
>>
>
> When I add 600 testcases, should I mention each of them in commit log?

Yes.

IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?

Richard.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>> Could we put a limit to the commit log entry? More than 500 hundred
>> lines changelog entries should just be rejected and this will avoid
>> someone accidentally committing a full log or a diff or just random
>> junk.
>>
>
> The following patch to our pre-commit hook enables this. I have tested
> it with a dummy repository but review from bourne-shell and/or
> subversion knowledgeable people would be welcome.
>

When I add 600 testcases, should I mention each of them in commit log?

-- 
H.J.

[PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

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

2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
> Could we put a limit to the commit log entry? More than 500 hundred
> lines changelog entries should just be rejected and this will avoid
> someone accidentally committing a full log or a diff or just random
> junk.
>

The following patch to our pre-commit hook enables this. I have tested
it with a dummy repository but review from bourne-shell and/or
subversion knowledgeable people would be welcome.

Who can approve this?

Cheers,

Manuel.

[-- Attachment #2: pre-commit.diff --]
[-- Type: text/plain, Size: 1723 bytes --]

Index: pre-commit
===================================================================
--- pre-commit	(revision 139590)
+++ pre-commit	(working copy)
@@ -47,7 +47,8 @@
 # If you're having unexpected problems with a hook program, the
 # culprit may be unusual (or missing) environment variables.
 # 
-# Here is an example hook script, for a Unix /bin/sh interpreter.# For more examples and pre-written hooks, see those in
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
 # the Subversion repository at
 # http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
 # http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
@@ -58,9 +59,23 @@
 
 # Make sure that the log message contains some text.
 SVNLOOK=/usr/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPOS" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
 
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "[a-zA-Z0-9]" > /dev/null
+if [ $? -ne 0 ]; then
+    echo "Please include a ChangeLog entry with this commit." >&2
+    exit 1
+fi
+
+# Do not allow log messages
+LOGLINES=`$SVNLOOK log -t "$TXN" "$REPOS" | wc -l`
+if test $LOGLINES -gt 500; then
+    echo "A single ChangeLog entry cannot be larger than 500 lines.       " >&2
+    echo "Please check again the log message of this commit.              " >&2
+    echo "If you are merging from/to a branch, never use log messages from" >&2
+    echo "other revisions as the commit message.                          " >&2
+    exit 1
+fi
+
 # Check that the author of this commit has the rights to perform
 # the commit on the files and directories being modified.
 #commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

Of 139510 commits, only 12 have more than 500 lines and only 9 have
more than 700. There are two with more than 1000 lines.

r136433 | jakub | 2008-06-06 15:01:54 +0200 (Fri, 06 Jun 2008) | 889 lines
r122168 | bkoz | 2007-02-20 19:15:01 +0100 (Tue, 20 Feb 2007) | 920 lines
r122018 | sandra | 2007-02-16 00:50:49 +0100 (Fri, 16 Feb 2007) | 862 lines
r114659 | bkoz | 2006-06-15 01:09:51 +0200 (Thu, 15 Jun 2006) | 878 lines
r108152 | rsandifo | 2005-12-07 08:53:14 +0100 (Wed, 07 Dec 2005) | 500 lines
r95152 | mkoch | 2005-02-17 08:48:58 +0100 (Thu, 17 Feb 2005) | 616 lines
r95115 | graydon | 2005-02-16 21:03:29 +0100 (Wed, 16 Feb 2005) | 1998 lines
r82314 | graydon | 2004-05-27 08:17:44 +0200 (Thu, 27 May 2004) | 556 lines
r79607 | graydon | 2004-03-17 22:29:02 +0100 (Wed, 17 Mar 2004) | 578 lines
r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines

Anyone can disable the hook script for special cases (it is versioned
after all just "svn co svn+ssh://gcc.gnu.org/svn/gcc/hooks").

Cheers,

Manuel



2008/8/26 Laurent GUERBY <laurent@guerby.net>:
> Out of curiosity did you do a batch scan of existing ChangeLog
> files to see how many entries are above your choosen limit of 500 lines?
>
> Laurent
>
> On Tue, 2008-08-26 at 16:18 +0200, Manuel López-Ibáñez wrote:
>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>> > Could we put a limit to the commit log entry? More than 500 hundred
>> > lines changelog entries should just be rejected and this will avoid
>> > someone accidentally committing a full log or a diff or just random
>> > junk.
>> >
>>
>> The following patch to our pre-commit hook enables this. I have tested
>> it with a dummy repository but review from bourne-shell and/or
>> subversion knowledgeable people would be welcome.
>>
>> Who can approve this?
>>
>> Cheers,
>>
>> Manuel.
>
>

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> When I add 600 testcases, should I mention each of them in commit log?

500 was just a number. That said, you could very well do 2 commits of
300 testcases.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> Shouldn't svnmerge be fixed not to generate such log?

svnmerge generates a file, it does not commit that file as a log for
you. In some other project, that file could be the commit log. However
in GCC's repository, committing that file is a mistake that some
people do sometimes. (Everybody does mistakes sometimes).

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>
>> When I add 600 testcases, should I mention each of them in commit log?
>
> 500 was just a number. That said, you could very well do 2 commits of
> 300 testcases.
>

It will be very odd. I believe some libjava merges updated more than 500
files. If we have to break such checkins into several smaller ones just
because svnmerge can't handle it properly, maybe we should ban
svnmerge instead.

FWIW, I don't use svnmerge and I never have any problems to
merge between branches with "svn merge".

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 Richard Guenther <richard.guenther@gmail.com>:
>
> IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?

600 lines is *very* long (see the numbers I just sent). We do not want
such large patches in one go. They make regression hunting useless.

But yes, we could balk at the string "via svnmerge from" which I think
is "standard" in logs generated by svnmerge. Would that be acceptable?

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> When I add 600 testcases, should I mention each of them in commit log?

500 was just a number. That said, you could very well do 2 commits of
300 testcases.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

Of 139510 commits, only 12 have more than 500 lines and only 9 have
more than 700. There are two with more than 1000 lines.

r136433 | jakub | 2008-06-06 15:01:54 +0200 (Fri, 06 Jun 2008) | 889 lines
r122168 | bkoz | 2007-02-20 19:15:01 +0100 (Tue, 20 Feb 2007) | 920 lines
r122018 | sandra | 2007-02-16 00:50:49 +0100 (Fri, 16 Feb 2007) | 862 lines
r114659 | bkoz | 2006-06-15 01:09:51 +0200 (Thu, 15 Jun 2006) | 878 lines
r108152 | rsandifo | 2005-12-07 08:53:14 +0100 (Wed, 07 Dec 2005) | 500 lines
r95152 | mkoch | 2005-02-17 08:48:58 +0100 (Thu, 17 Feb 2005) | 616 lines
r95115 | graydon | 2005-02-16 21:03:29 +0100 (Wed, 16 Feb 2005) | 1998 lines
r82314 | graydon | 2004-05-27 08:17:44 +0200 (Thu, 27 May 2004) | 556 lines
r79607 | graydon | 2004-03-17 22:29:02 +0100 (Wed, 17 Mar 2004) | 578 lines
r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines

Anyone can disable the hook script for special cases (it is versioned
after all just "svn co svn+ssh://gcc.gnu.org/svn/gcc/hooks").

Cheers,

Manuel



2008/8/26 Laurent GUERBY <laurent@guerby.net>:
> Out of curiosity did you do a batch scan of existing ChangeLog
> files to see how many entries are above your choosen limit of 500 lines?
>
> Laurent
>
> On Tue, 2008-08-26 at 16:18 +0200, Manuel López-Ibáñez wrote:
>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>> > Could we put a limit to the commit log entry? More than 500 hundred
>> > lines changelog entries should just be rejected and this will avoid
>> > someone accidentally committing a full log or a diff or just random
>> > junk.
>> >
>>
>> The following patch to our pre-commit hook enables this. I have tested
>> it with a dummy repository but review from bourne-shell and/or
>> subversion knowledgeable people would be welcome.
>>
>> Who can approve this?
>>
>> Cheers,
>>
>> Manuel.
>
>

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> Shouldn't svnmerge be fixed not to generate such log?

svnmerge generates a file, it does not commit that file as a log for
you. In some other project, that file could be the commit log. However
in GCC's repository, committing that file is a mistake that some
people do sometimes. (Everybody does mistakes sometimes).

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 Richard Guenther <richard.guenther@gmail.com>:
>
> IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?

600 lines is *very* long (see the numbers I just sent). We do not want
such large patches in one go. They make regression hunting useless.

But yes, we could balk at the string "via svnmerge from" which I think
is "standard" in logs generated by svnmerge. Would that be acceptable?

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Richard Guenther]

On Tue, Aug 26, 2008 at 5:06 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>>> Could we put a limit to the commit log entry? More than 500 hundred
>>> lines changelog entries should just be rejected and this will avoid
>>> someone accidentally committing a full log or a diff or just random
>>> junk.
>>>
>>
>> The following patch to our pre-commit hook enables this. I have tested
>> it with a dummy repository but review from bourne-shell and/or
>> subversion knowledgeable people would be welcome.
>>
>
> When I add 600 testcases, should I mention each of them in commit log?

Yes.

IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?

Richard.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>
>> When I add 600 testcases, should I mention each of them in commit log?
>
> 500 was just a number. That said, you could very well do 2 commits of
> 300 testcases.
>

It will be very odd. I believe some libjava merges updated more than 500
files. If we have to break such checkins into several smaller ones just
because svnmerge can't handle it properly, maybe we should ban
svnmerge instead.

FWIW, I don't use svnmerge and I never have any problems to
merge between branches with "svn merge".

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
> On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>>
>>> When I add 600 testcases, should I mention each of them in commit log?
>>
>> 500 was just a number. That said, you could very well do 2 commits of
>> 300 testcases.
>>
>
> It will be very odd. I believe some libjava merges updated more than 500
> files. If we have to break such checkins into several smaller ones just
> because svnmerge can't handle it properly, maybe we should ban
> svnmerge instead.
>
> FWIW, I don't use svnmerge and I never have any problems to
> merge between branches with "svn merge".
>

H.J.,

I think you are misunderstanding the problem that this patch is trying to solve.

If you do: svn ci -F file
subversion will use the contents of 'file' as the commit log that you
later can check with 'svn log'.
After a merge but before committing svnmerge generates a file with the
'svn log' output of all revisions merged. If you use this file as the
commit log, then you (a) make harder to read the output of 'svn log'
(b) flood the gcc.gnu.org servers that are parsing your commit log for
PR numbers and sending emails to bugzilla and subscribers. The emails
are the commit logs, so they are typically a very long email with
multiple commits that has no relevance to the receiver.

This is documented in http://gcc.gnu.org/wiki/SvnBranch but everybody
do mistakes.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

Of 139510 commits, only 12 have more than 500 lines and only 9 have
more than 700. There are two with more than 1000 lines.

r136433 | jakub | 2008-06-06 15:01:54 +0200 (Fri, 06 Jun 2008) | 889 lines
r122168 | bkoz | 2007-02-20 19:15:01 +0100 (Tue, 20 Feb 2007) | 920 lines
r122018 | sandra | 2007-02-16 00:50:49 +0100 (Fri, 16 Feb 2007) | 862 lines
r114659 | bkoz | 2006-06-15 01:09:51 +0200 (Thu, 15 Jun 2006) | 878 lines
r108152 | rsandifo | 2005-12-07 08:53:14 +0100 (Wed, 07 Dec 2005) | 500 lines
r95152 | mkoch | 2005-02-17 08:48:58 +0100 (Thu, 17 Feb 2005) | 616 lines
r95115 | graydon | 2005-02-16 21:03:29 +0100 (Wed, 16 Feb 2005) | 1998 lines
r82314 | graydon | 2004-05-27 08:17:44 +0200 (Thu, 27 May 2004) | 556 lines
r79607 | graydon | 2004-03-17 22:29:02 +0100 (Wed, 17 Mar 2004) | 578 lines
r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines

Anyone can disable the hook script for special cases (it is versioned
after all just "svn co svn+ssh://gcc.gnu.org/svn/gcc/hooks").

Cheers,

Manuel



2008/8/26 Laurent GUERBY <laurent@guerby.net>:
> Out of curiosity did you do a batch scan of existing ChangeLog
> files to see how many entries are above your choosen limit of 500 lines?
>
> Laurent
>
> On Tue, 2008-08-26 at 16:18 +0200, Manuel López-Ibáñez wrote:
>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>> > Could we put a limit to the commit log entry? More than 500 hundred
>> > lines changelog entries should just be rejected and this will avoid
>> > someone accidentally committing a full log or a diff or just random
>> > junk.
>> >
>>
>> The following patch to our pre-commit hook enables this. I have tested
>> it with a dummy repository but review from bourne-shell and/or
>> subversion knowledgeable people would be welcome.
>>
>> Who can approve this?
>>
>> Cheers,
>>
>> Manuel.
>
>

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> When I add 600 testcases, should I mention each of them in commit log?

500 was just a number. That said, you could very well do 2 commits of
300 testcases.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> Shouldn't svnmerge be fixed not to generate such log?

svnmerge generates a file, it does not commit that file as a log for
you. In some other project, that file could be the commit log. However
in GCC's repository, committing that file is a mistake that some
people do sometimes. (Everybody does mistakes sometimes).

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

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

2008/8/26 Richard Guenther <richard.guenther@gmail.com>:
>
> Can't we simply detect svnmerge logs somehow?

I think this will do it as long as they do not change the message.

Opinions?

Cheers,

Manuel.

[-- Attachment #2: pre-commit-ban-svnmerge-logs.diff --]
[-- Type: text/plain, Size: 1571 bytes --]

Index: pre-commit
===================================================================
--- pre-commit	(revision 139590)
+++ pre-commit	(working copy)
@@ -47,7 +47,8 @@
 # If you're having unexpected problems with a hook program, the
 # culprit may be unusual (or missing) environment variables.
 # 
-# Here is an example hook script, for a Unix /bin/sh interpreter.# For more examples and pre-written hooks, see those in
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
 # the Subversion repository at
 # http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
 # http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
@@ -58,9 +59,21 @@
 
 # Make sure that the log message contains some text.
 SVNLOOK=/usr/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPOS" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
 
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "[a-zA-Z0-9]" > /dev/null
+if [ $? -ne 0 ]; then
+    echo "Please include a ChangeLog entry with this commit." >&2
+    exit 1
+fi
+
+# Do not allow log messages
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "via svnmerge from" > /dev/null
+if [ $? -eq 0 ]; then
+    echo "Please, do not use the log generated by svnmerge as a commit log.">&2
+    echo "Read http://gcc.gnu.org/wiki/SvnBranch for more information.     ">&2
+    exit 1
+fi
+
 # Check that the author of this commit has the rights to perform
 # the commit on the files and directories being modified.
 #commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
> On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>>
>>> When I add 600 testcases, should I mention each of them in commit log?
>>
>> 500 was just a number. That said, you could very well do 2 commits of
>> 300 testcases.
>>
>
> It will be very odd. I believe some libjava merges updated more than 500
> files. If we have to break such checkins into several smaller ones just
> because svnmerge can't handle it properly, maybe we should ban
> svnmerge instead.
>
> FWIW, I don't use svnmerge and I never have any problems to
> merge between branches with "svn merge".
>

H.J.,

I think you are misunderstanding the problem that this patch is trying to solve.

If you do: svn ci -F file
subversion will use the contents of 'file' as the commit log that you
later can check with 'svn log'.
After a merge but before committing svnmerge generates a file with the
'svn log' output of all revisions merged. If you use this file as the
commit log, then you (a) make harder to read the output of 'svn log'
(b) flood the gcc.gnu.org servers that are parsing your commit log for
PR numbers and sending emails to bugzilla and subscribers. The emails
are the commit logs, so they are typically a very long email with
multiple commits that has no relevance to the receiver.

This is documented in http://gcc.gnu.org/wiki/SvnBranch but everybody
do mistakes.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 8:36 AM, Richard Guenther
<richard.guenther@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 5:06 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>> On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
>> <lopezibanez@gmail.com> wrote:
>>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>>>> Could we put a limit to the commit log entry? More than 500 hundred
>>>> lines changelog entries should just be rejected and this will avoid
>>>> someone accidentally committing a full log or a diff or just random
>>>> junk.
>>>>
>>>
>>> The following patch to our pre-commit hook enables this. I have tested
>>> it with a dummy repository but review from bourne-shell and/or
>>> subversion knowledgeable people would be welcome.
>>>
>>
>> When I add 600 testcases, should I mention each of them in commit log?
>
> Yes.
>
> IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?
>

Shouldn't svnmerge be fixed not to generate such log?


-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

Of 139510 commits, only 12 have more than 500 lines and only 9 have
more than 700. There are two with more than 1000 lines.

r136433 | jakub | 2008-06-06 15:01:54 +0200 (Fri, 06 Jun 2008) | 889 lines
r122168 | bkoz | 2007-02-20 19:15:01 +0100 (Tue, 20 Feb 2007) | 920 lines
r122018 | sandra | 2007-02-16 00:50:49 +0100 (Fri, 16 Feb 2007) | 862 lines
r114659 | bkoz | 2006-06-15 01:09:51 +0200 (Thu, 15 Jun 2006) | 878 lines
r108152 | rsandifo | 2005-12-07 08:53:14 +0100 (Wed, 07 Dec 2005) | 500 lines
r95152 | mkoch | 2005-02-17 08:48:58 +0100 (Thu, 17 Feb 2005) | 616 lines
r95115 | graydon | 2005-02-16 21:03:29 +0100 (Wed, 16 Feb 2005) | 1998 lines
r82314 | graydon | 2004-05-27 08:17:44 +0200 (Thu, 27 May 2004) | 556 lines
r79607 | graydon | 2004-03-17 22:29:02 +0100 (Wed, 17 Mar 2004) | 578 lines
r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines

Anyone can disable the hook script for special cases (it is versioned
after all just "svn co svn+ssh://gcc.gnu.org/svn/gcc/hooks").

Cheers,

Manuel



2008/8/26 Laurent GUERBY <laurent@guerby.net>:
> Out of curiosity did you do a batch scan of existing ChangeLog
> files to see how many entries are above your choosen limit of 500 lines?
>
> Laurent
>
> On Tue, 2008-08-26 at 16:18 +0200, Manuel López-Ibáñez wrote:
>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>> > Could we put a limit to the commit log entry? More than 500 hundred
>> > lines changelog entries should just be rejected and this will avoid
>> > someone accidentally committing a full log or a diff or just random
>> > junk.
>> >
>>
>> The following patch to our pre-commit hook enables this. I have tested
>> it with a dummy repository but review from bourne-shell and/or
>> subversion knowledgeable people would be welcome.
>>
>> Who can approve this?
>>
>> Cheers,
>>
>> Manuel.
>
>

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
> On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>>
>>> When I add 600 testcases, should I mention each of them in commit log?
>>
>> 500 was just a number. That said, you could very well do 2 commits of
>> 300 testcases.
>>
>
> It will be very odd. I believe some libjava merges updated more than 500
> files. If we have to break such checkins into several smaller ones just
> because svnmerge can't handle it properly, maybe we should ban
> svnmerge instead.
>
> FWIW, I don't use svnmerge and I never have any problems to
> merge between branches with "svn merge".
>

H.J.,

I think you are misunderstanding the problem that this patch is trying to solve.

If you do: svn ci -F file
subversion will use the contents of 'file' as the commit log that you
later can check with 'svn log'.
After a merge but before committing svnmerge generates a file with the
'svn log' output of all revisions merged. If you use this file as the
commit log, then you (a) make harder to read the output of 'svn log'
(b) flood the gcc.gnu.org servers that are parsing your commit log for
PR numbers and sending emails to bugzilla and subscribers. The emails
are the commit logs, so they are typically a very long email with
multiple commits that has no relevance to the receiver.

This is documented in http://gcc.gnu.org/wiki/SvnBranch but everybody
do mistakes.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 Richard Guenther <richard.guenther@gmail.com>:
>
> IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?

600 lines is *very* long (see the numbers I just sent). We do not want
such large patches in one go. They make regression hunting useless.

But yes, we could balk at the string "via svnmerge from" which I think
is "standard" in logs generated by svnmerge. Would that be acceptable?

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>> Could we put a limit to the commit log entry? More than 500 hundred
>> lines changelog entries should just be rejected and this will avoid
>> someone accidentally committing a full log or a diff or just random
>> junk.
>>
>
> The following patch to our pre-commit hook enables this. I have tested
> it with a dummy repository but review from bourne-shell and/or
> subversion knowledgeable people would be welcome.
>

When I add 600 testcases, should I mention each of them in commit log?

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> Shouldn't svnmerge be fixed not to generate such log?

svnmerge generates a file, it does not commit that file as a log for
you. In some other project, that file could be the commit log. However
in GCC's repository, committing that file is a mistake that some
people do sometimes. (Everybody does mistakes sometimes).

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>
>> When I add 600 testcases, should I mention each of them in commit log?
>
> 500 was just a number. That said, you could very well do 2 commits of
> 300 testcases.
>

It will be very odd. I believe some libjava merges updated more than 500
files. If we have to break such checkins into several smaller ones just
because svnmerge can't handle it properly, maybe we should ban
svnmerge instead.

FWIW, I don't use svnmerge and I never have any problems to
merge between branches with "svn merge".

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Richard Guenther]

On Tue, Aug 26, 2008 at 5:06 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>>> Could we put a limit to the commit log entry? More than 500 hundred
>>> lines changelog entries should just be rejected and this will avoid
>>> someone accidentally committing a full log or a diff or just random
>>> junk.
>>>
>>
>> The following patch to our pre-commit hook enables this. I have tested
>> it with a dummy repository but review from bourne-shell and/or
>> subversion knowledgeable people would be welcome.
>>
>
> When I add 600 testcases, should I mention each of them in commit log?

Yes.

IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?

Richard.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> When I add 600 testcases, should I mention each of them in commit log?

500 was just a number. That said, you could very well do 2 commits of
300 testcases.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 9:46 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>> On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
>> <lopezibanez@gmail.com> wrote:
>>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>>>
>>>> When I add 600 testcases, should I mention each of them in commit log?
>>>
>>> 500 was just a number. That said, you could very well do 2 commits of
>>> 300 testcases.
>>>
>>
>> It will be very odd. I believe some libjava merges updated more than 500
>> files. If we have to break such checkins into several smaller ones just
>> because svnmerge can't handle it properly, maybe we should ban
>> svnmerge instead.
>>
>> FWIW, I don't use svnmerge and I never have any problems to
>> merge between branches with "svn merge".
>>
>
> H.J.,
>
> I think you are misunderstanding the problem that this patch is trying to solve.
>
> If you do: svn ci -F file
> subversion will use the contents of 'file' as the commit log that you
> later can check with 'svn log'.
> After a merge but before committing svnmerge generates a file with the
> 'svn log' output of all revisions merged. If you use this file as the
> commit log, then you (a) make harder to read the output of 'svn log'
> (b) flood the gcc.gnu.org servers that are parsing your commit log for
> PR numbers and sending emails to bugzilla and subscribers. The emails
> are the commit logs, so they are typically a very long email with
> multiple commits that has no relevance to the receiver.

Can we modify svnmerge to generate an output which will be ignored
by "svn ci"? Will "svn ci" ignore lines after

--This line, and those below, will be ignored--

if svnmerge puts it at the beginning of its output?

-- 
H.J.

[PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

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

2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
> Could we put a limit to the commit log entry? More than 500 hundred
> lines changelog entries should just be rejected and this will avoid
> someone accidentally committing a full log or a diff or just random
> junk.
>

The following patch to our pre-commit hook enables this. I have tested
it with a dummy repository but review from bourne-shell and/or
subversion knowledgeable people would be welcome.

Who can approve this?

Cheers,

Manuel.

[-- Attachment #2: pre-commit.diff --]
[-- Type: text/plain, Size: 1723 bytes --]

Index: pre-commit
===================================================================
--- pre-commit	(revision 139590)
+++ pre-commit	(working copy)
@@ -47,7 +47,8 @@
 # If you're having unexpected problems with a hook program, the
 # culprit may be unusual (or missing) environment variables.
 # 
-# Here is an example hook script, for a Unix /bin/sh interpreter.# For more examples and pre-written hooks, see those in
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
 # the Subversion repository at
 # http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
 # http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
@@ -58,9 +59,23 @@
 
 # Make sure that the log message contains some text.
 SVNLOOK=/usr/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPOS" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
 
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "[a-zA-Z0-9]" > /dev/null
+if [ $? -ne 0 ]; then
+    echo "Please include a ChangeLog entry with this commit." >&2
+    exit 1
+fi
+
+# Do not allow log messages
+LOGLINES=`$SVNLOOK log -t "$TXN" "$REPOS" | wc -l`
+if test $LOGLINES -gt 500; then
+    echo "A single ChangeLog entry cannot be larger than 500 lines.       " >&2
+    echo "Please check again the log message of this commit.              " >&2
+    echo "If you are merging from/to a branch, never use log messages from" >&2
+    echo "other revisions as the commit message.                          " >&2
+    exit 1
+fi
+
 # Check that the author of this commit has the rights to perform
 # the commit on the files and directories being modified.
 #commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> Can we modify svnmerge to generate an output which will be ignored
> by "svn ci"?

svnmerge comes with your subversion distribution.
(e.g., package subversion-tools in Ubuntu)
We do not control it.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Paolo Bonzini]

> r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
> r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
> r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines

These were mistakes, and it's the only three I checked.  100% rate. :-)

Paolo

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 10:36 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>
>> Can we modify svnmerge to generate an output which will be ignored
>> by "svn ci"?
>
> svnmerge comes with your subversion distribution.
> (e.g., package subversion-tools in Ubuntu)
> We do not control it.
>

Fedora 9 doesn't come with svnmerge. I don't think it is the
part of the regular subversion package.

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> Shouldn't svnmerge be fixed not to generate such log?

svnmerge generates a file, it does not commit that file as a log for
you. In some other project, that file could be the commit log. However
in GCC's repository, committing that file is a mistake that some
people do sometimes. (Everybody does mistakes sometimes).

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> Can we modify svnmerge to generate an output which will be ignored
> by "svn ci"?

svnmerge comes with your subversion distribution.
(e.g., package subversion-tools in Ubuntu)
We do not control it.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 9:46 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>> On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
>> <lopezibanez@gmail.com> wrote:
>>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>>>
>>>> When I add 600 testcases, should I mention each of them in commit log?
>>>
>>> 500 was just a number. That said, you could very well do 2 commits of
>>> 300 testcases.
>>>
>>
>> It will be very odd. I believe some libjava merges updated more than 500
>> files. If we have to break such checkins into several smaller ones just
>> because svnmerge can't handle it properly, maybe we should ban
>> svnmerge instead.
>>
>> FWIW, I don't use svnmerge and I never have any problems to
>> merge between branches with "svn merge".
>>
>
> H.J.,
>
> I think you are misunderstanding the problem that this patch is trying to solve.
>
> If you do: svn ci -F file
> subversion will use the contents of 'file' as the commit log that you
> later can check with 'svn log'.
> After a merge but before committing svnmerge generates a file with the
> 'svn log' output of all revisions merged. If you use this file as the
> commit log, then you (a) make harder to read the output of 'svn log'
> (b) flood the gcc.gnu.org servers that are parsing your commit log for
> PR numbers and sending emails to bugzilla and subscribers. The emails
> are the commit logs, so they are typically a very long email with
> multiple commits that has no relevance to the receiver.

Can we modify svnmerge to generate an output which will be ignored
by "svn ci"? Will "svn ci" ignore lines after

--This line, and those below, will be ignored--

if svnmerge puts it at the beginning of its output?

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Paolo Bonzini]

> r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
> r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
> r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines

These were mistakes, and it's the only three I checked.  100% rate. :-)

Paolo

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 8:36 AM, Richard Guenther
<richard.guenther@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 5:06 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>> On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
>> <lopezibanez@gmail.com> wrote:
>>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>>>> Could we put a limit to the commit log entry? More than 500 hundred
>>>> lines changelog entries should just be rejected and this will avoid
>>>> someone accidentally committing a full log or a diff or just random
>>>> junk.
>>>>
>>>
>>> The following patch to our pre-commit hook enables this. I have tested
>>> it with a dummy repository but review from bourne-shell and/or
>>> subversion knowledgeable people would be welcome.
>>>
>>
>> When I add 600 testcases, should I mention each of them in commit log?
>
> Yes.
>
> IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?
>

Shouldn't svnmerge be fixed not to generate such log?


-- 
H.J.

[PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

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

2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
> Could we put a limit to the commit log entry? More than 500 hundred
> lines changelog entries should just be rejected and this will avoid
> someone accidentally committing a full log or a diff or just random
> junk.
>

The following patch to our pre-commit hook enables this. I have tested
it with a dummy repository but review from bourne-shell and/or
subversion knowledgeable people would be welcome.

Who can approve this?

Cheers,

Manuel.

[-- Attachment #2: pre-commit.diff --]
[-- Type: text/plain, Size: 1723 bytes --]

Index: pre-commit
===================================================================
--- pre-commit	(revision 139590)
+++ pre-commit	(working copy)
@@ -47,7 +47,8 @@
 # If you're having unexpected problems with a hook program, the
 # culprit may be unusual (or missing) environment variables.
 # 
-# Here is an example hook script, for a Unix /bin/sh interpreter.# For more examples and pre-written hooks, see those in
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
 # the Subversion repository at
 # http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
 # http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
@@ -58,9 +59,23 @@
 
 # Make sure that the log message contains some text.
 SVNLOOK=/usr/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPOS" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
 
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "[a-zA-Z0-9]" > /dev/null
+if [ $? -ne 0 ]; then
+    echo "Please include a ChangeLog entry with this commit." >&2
+    exit 1
+fi
+
+# Do not allow log messages
+LOGLINES=`$SVNLOOK log -t "$TXN" "$REPOS" | wc -l`
+if test $LOGLINES -gt 500; then
+    echo "A single ChangeLog entry cannot be larger than 500 lines.       " >&2
+    echo "Please check again the log message of this commit.              " >&2
+    echo "If you are merging from/to a branch, never use log messages from" >&2
+    echo "other revisions as the commit message.                          " >&2
+    exit 1
+fi
+
 # Check that the author of this commit has the rights to perform
 # the commit on the files and directories being modified.
 #commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 10:36 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>
>> Can we modify svnmerge to generate an output which will be ignored
>> by "svn ci"?
>
> svnmerge comes with your subversion distribution.
> (e.g., package subversion-tools in Ubuntu)
> We do not control it.
>

Fedora 9 doesn't come with svnmerge. I don't think it is the
part of the regular subversion package.

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
> On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>>
>>> When I add 600 testcases, should I mention each of them in commit log?
>>
>> 500 was just a number. That said, you could very well do 2 commits of
>> 300 testcases.
>>
>
> It will be very odd. I believe some libjava merges updated more than 500
> files. If we have to break such checkins into several smaller ones just
> because svnmerge can't handle it properly, maybe we should ban
> svnmerge instead.
>
> FWIW, I don't use svnmerge and I never have any problems to
> merge between branches with "svn merge".
>

H.J.,

I think you are misunderstanding the problem that this patch is trying to solve.

If you do: svn ci -F file
subversion will use the contents of 'file' as the commit log that you
later can check with 'svn log'.
After a merge but before committing svnmerge generates a file with the
'svn log' output of all revisions merged. If you use this file as the
commit log, then you (a) make harder to read the output of 'svn log'
(b) flood the gcc.gnu.org servers that are parsing your commit log for
PR numbers and sending emails to bugzilla and subscribers. The emails
are the commit logs, so they are typically a very long email with
multiple commits that has no relevance to the receiver.

This is documented in http://gcc.gnu.org/wiki/SvnBranch but everybody
do mistakes.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

Of 139510 commits, only 12 have more than 500 lines and only 9 have
more than 700. There are two with more than 1000 lines.

r136433 | jakub | 2008-06-06 15:01:54 +0200 (Fri, 06 Jun 2008) | 889 lines
r122168 | bkoz | 2007-02-20 19:15:01 +0100 (Tue, 20 Feb 2007) | 920 lines
r122018 | sandra | 2007-02-16 00:50:49 +0100 (Fri, 16 Feb 2007) | 862 lines
r114659 | bkoz | 2006-06-15 01:09:51 +0200 (Thu, 15 Jun 2006) | 878 lines
r108152 | rsandifo | 2005-12-07 08:53:14 +0100 (Wed, 07 Dec 2005) | 500 lines
r95152 | mkoch | 2005-02-17 08:48:58 +0100 (Thu, 17 Feb 2005) | 616 lines
r95115 | graydon | 2005-02-16 21:03:29 +0100 (Wed, 16 Feb 2005) | 1998 lines
r82314 | graydon | 2004-05-27 08:17:44 +0200 (Thu, 27 May 2004) | 556 lines
r79607 | graydon | 2004-03-17 22:29:02 +0100 (Wed, 17 Mar 2004) | 578 lines
r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines

Anyone can disable the hook script for special cases (it is versioned
after all just "svn co svn+ssh://gcc.gnu.org/svn/gcc/hooks").

Cheers,

Manuel



2008/8/26 Laurent GUERBY <laurent@guerby.net>:
> Out of curiosity did you do a batch scan of existing ChangeLog
> files to see how many entries are above your choosen limit of 500 lines?
>
> Laurent
>
> On Tue, 2008-08-26 at 16:18 +0200, Manuel López-Ibáñez wrote:
>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>> > Could we put a limit to the commit log entry? More than 500 hundred
>> > lines changelog entries should just be rejected and this will avoid
>> > someone accidentally committing a full log or a diff or just random
>> > junk.
>> >
>>
>> The following patch to our pre-commit hook enables this. I have tested
>> it with a dummy repository but review from bourne-shell and/or
>> subversion knowledgeable people would be welcome.
>>
>> Who can approve this?
>>
>> Cheers,
>>
>> Manuel.
>
>

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> When I add 600 testcases, should I mention each of them in commit log?

500 was just a number. That said, you could very well do 2 commits of
300 testcases.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> Can we modify svnmerge to generate an output which will be ignored
> by "svn ci"?

svnmerge comes with your subversion distribution.
(e.g., package subversion-tools in Ubuntu)
We do not control it.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

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

2008/8/26 Richard Guenther <richard.guenther@gmail.com>:
>
> Can't we simply detect svnmerge logs somehow?

I think this will do it as long as they do not change the message.

Opinions?

Cheers,

Manuel.

[-- Attachment #2: pre-commit-ban-svnmerge-logs.diff --]
[-- Type: text/plain, Size: 1571 bytes --]

Index: pre-commit
===================================================================
--- pre-commit	(revision 139590)
+++ pre-commit	(working copy)
@@ -47,7 +47,8 @@
 # If you're having unexpected problems with a hook program, the
 # culprit may be unusual (or missing) environment variables.
 # 
-# Here is an example hook script, for a Unix /bin/sh interpreter.# For more examples and pre-written hooks, see those in
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
 # the Subversion repository at
 # http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
 # http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
@@ -58,9 +59,21 @@
 
 # Make sure that the log message contains some text.
 SVNLOOK=/usr/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPOS" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
 
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "[a-zA-Z0-9]" > /dev/null
+if [ $? -ne 0 ]; then
+    echo "Please include a ChangeLog entry with this commit." >&2
+    exit 1
+fi
+
+# Do not allow log messages
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "via svnmerge from" > /dev/null
+if [ $? -eq 0 ]; then
+    echo "Please, do not use the log generated by svnmerge as a commit log.">&2
+    echo "Read http://gcc.gnu.org/wiki/SvnBranch for more information.     ">&2
+    exit 1
+fi
+
 # Check that the author of this commit has the rights to perform
 # the commit on the files and directories being modified.
 #commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
> On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>>
>>> When I add 600 testcases, should I mention each of them in commit log?
>>
>> 500 was just a number. That said, you could very well do 2 commits of
>> 300 testcases.
>>
>
> It will be very odd. I believe some libjava merges updated more than 500
> files. If we have to break such checkins into several smaller ones just
> because svnmerge can't handle it properly, maybe we should ban
> svnmerge instead.
>
> FWIW, I don't use svnmerge and I never have any problems to
> merge between branches with "svn merge".
>

H.J.,

I think you are misunderstanding the problem that this patch is trying to solve.

If you do: svn ci -F file
subversion will use the contents of 'file' as the commit log that you
later can check with 'svn log'.
After a merge but before committing svnmerge generates a file with the
'svn log' output of all revisions merged. If you use this file as the
commit log, then you (a) make harder to read the output of 'svn log'
(b) flood the gcc.gnu.org servers that are parsing your commit log for
PR numbers and sending emails to bugzilla and subscribers. The emails
are the commit logs, so they are typically a very long email with
multiple commits that has no relevance to the receiver.

This is documented in http://gcc.gnu.org/wiki/SvnBranch but everybody
do mistakes.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> When I add 600 testcases, should I mention each of them in commit log?

500 was just a number. That said, you could very well do 2 commits of
300 testcases.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 Richard Guenther <richard.guenther@gmail.com>:
>
> IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?

600 lines is *very* long (see the numbers I just sent). We do not want
such large patches in one go. They make regression hunting useless.

But yes, we could balk at the string "via svnmerge from" which I think
is "standard" in logs generated by svnmerge. Would that be acceptable?

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Richard Guenther]

On Tue, Aug 26, 2008 at 5:06 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>>> Could we put a limit to the commit log entry? More than 500 hundred
>>> lines changelog entries should just be rejected and this will avoid
>>> someone accidentally committing a full log or a diff or just random
>>> junk.
>>>
>>
>> The following patch to our pre-commit hook enables this. I have tested
>> it with a dummy repository but review from bourne-shell and/or
>> subversion knowledgeable people would be welcome.
>>
>
> When I add 600 testcases, should I mention each of them in commit log?

Yes.

IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?

Richard.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 9:46 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>> On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
>> <lopezibanez@gmail.com> wrote:
>>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>>>
>>>> When I add 600 testcases, should I mention each of them in commit log?
>>>
>>> 500 was just a number. That said, you could very well do 2 commits of
>>> 300 testcases.
>>>
>>
>> It will be very odd. I believe some libjava merges updated more than 500
>> files. If we have to break such checkins into several smaller ones just
>> because svnmerge can't handle it properly, maybe we should ban
>> svnmerge instead.
>>
>> FWIW, I don't use svnmerge and I never have any problems to
>> merge between branches with "svn merge".
>>
>
> H.J.,
>
> I think you are misunderstanding the problem that this patch is trying to solve.
>
> If you do: svn ci -F file
> subversion will use the contents of 'file' as the commit log that you
> later can check with 'svn log'.
> After a merge but before committing svnmerge generates a file with the
> 'svn log' output of all revisions merged. If you use this file as the
> commit log, then you (a) make harder to read the output of 'svn log'
> (b) flood the gcc.gnu.org servers that are parsing your commit log for
> PR numbers and sending emails to bugzilla and subscribers. The emails
> are the commit logs, so they are typically a very long email with
> multiple commits that has no relevance to the receiver.

Can we modify svnmerge to generate an output which will be ignored
by "svn ci"? Will "svn ci" ignore lines after

--This line, and those below, will be ignored--

if svnmerge puts it at the beginning of its output?

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> Can we modify svnmerge to generate an output which will be ignored
> by "svn ci"?

svnmerge comes with your subversion distribution.
(e.g., package subversion-tools in Ubuntu)
We do not control it.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Paolo Bonzini]

> r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
> r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
> r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines

These were mistakes, and it's the only three I checked.  100% rate. :-)

Paolo

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>
>> When I add 600 testcases, should I mention each of them in commit log?
>
> 500 was just a number. That said, you could very well do 2 commits of
> 300 testcases.
>

It will be very odd. I believe some libjava merges updated more than 500
files. If we have to break such checkins into several smaller ones just
because svnmerge can't handle it properly, maybe we should ban
svnmerge instead.

FWIW, I don't use svnmerge and I never have any problems to
merge between branches with "svn merge".

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

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

2008/8/26 Paolo Bonzini <bonzini@gnu.org>:
>> r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
>> r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
>> r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines
>
> These were mistakes, and it's the only three I checked.  100% rate. :-)

I forgot to mention that I ran svn log in trunk only. In branches the
numbers are higher precisely because of the use of automatic logs.
This is the list for the complete repository.

r139372 | xguo | 2008-08-21 08:31:54 +0200 (Thu, 21 Aug 2008) | 706 lines
r139145 | jfreeman | 2008-08-16 04:48:37 +0200 (Sat, 16 Aug 2008) | 19741 lines
r139138 | rus | 2008-08-15 23:37:08 +0200 (Fri, 15 Aug 2008) | 9832 lines
r136433 | jakub | 2008-06-06 15:01:54 +0200 (Fri, 06 Jun 2008) | 889 lines
r125859 | chaoyingfu | 2007-06-19 22:31:53 +0200 (Tue, 19 Jun 2007) | 866 lines
r125840 | chaoyingfu | 2007-06-19 02:42:29 +0200 (Tue, 19 Jun 2007) | 959 lines
r125581 | chaoyingfu | 2007-06-09 00:00:05 +0200 (Sat, 09 Jun 2007) | 3685 lines
r125344 | chaoyingfu | 2007-06-05 23:05:27 +0200 (Tue, 05 Jun 2007) | 965 lines
r125076 | chaoyingfu | 2007-05-26 00:20:57 +0200 (Sat, 26 May 2007) | 517 lines
r124838 | chaoyingfu | 2007-05-19 01:03:14 +0200 (Sat, 19 May 2007) | 895 lines
r124723 | chaoyingfu | 2007-05-14 22:05:48 +0200 (Mon, 14 May 2007) | 858 lines
r124555 | chaoyingfu | 2007-05-08 23:22:26 +0200 (Tue, 08 May 2007) | 822 lines
r124405 | chaoyingfu | 2007-05-04 02:47:49 +0200 (Fri, 04 May 2007) | 1007 lines
r124256 | kargl | 2007-04-28 06:11:29 +0200 (Sat, 28 Apr 2007) | 510 lines
r124241 | chaoyingfu | 2007-04-27 23:37:29 +0200 (Fri, 27 Apr 2007) | 522 lines
r124137 | chaoyingfu | 2007-04-25 02:55:02 +0200 (Wed, 25 Apr 2007) | 1501 lines
r123894 | chaoyingfu | 2007-04-16 22:48:50 +0200 (Mon, 16 Apr 2007) | 1774 lines
r123627 | chaoyingfu | 2007-04-06 22:43:35 +0200 (Fri, 06 Apr 2007) | 3063 lines
r123365 | chaoyingfu | 2007-03-30 20:51:44 +0200 (Fri, 30 Mar 2007) | 679 lines
r123228 | chaoyingfu | 2007-03-26 22:47:45 +0200 (Mon, 26 Mar 2007) | 892 lines
r123097 | chaoyingfu | 2007-03-21 01:15:47 +0100 (Wed, 21 Mar 2007) | 1974 lines
r122862 | chaoyingfu | 2007-03-12 21:12:30 +0100 (Mon, 12 Mar 2007) | 2080 lines
r122629 | chaoyingfu | 2007-03-06 19:08:30 +0100 (Tue, 06 Mar 2007) | 1610 lines
r122357 | chaoyingfu | 2007-02-27 02:35:27 +0100 (Tue, 27 Feb 2007) | 1949 lines
r122168 | bkoz | 2007-02-20 19:15:01 +0100 (Tue, 20 Feb 2007) | 920 lines
r122018 | sandra | 2007-02-16 00:50:49 +0100 (Fri, 16 Feb 2007) | 862 lines
r121624 | chaoyingfu | 2007-02-06 00:06:52 +0100 (Tue, 06 Feb 2007) | 1519 lines
r121327 | chaoyingfu | 2007-01-30 01:43:02 +0100 (Tue, 30 Jan 2007) | 1627 lines
r121062 | chaoyingfu | 2007-01-22 20:42:48 +0100 (Mon, 22 Jan 2007) | 1628 lines
r120866 | chaoyingfu | 2007-01-17 20:16:47 +0100 (Wed, 17 Jan 2007) | 1741 lines
r120377 | chaoyingfu | 2007-01-03 03:12:19 +0100 (Wed, 03 Jan 2007) | 974 lines
r120376 | chaoyingfu | 2007-01-03 02:34:59 +0100 (Wed, 03 Jan 2007) | 805 lines
r119394 | chaoyingfu | 2006-12-01 02:57:22 +0100 (Fri, 01 Dec 2006) | 886 lines
r119392 | chaoyingfu | 2006-12-01 02:01:21 +0100 (Fri, 01 Dec 2006) | 787 lines
r119391 | chaoyingfu | 2006-12-01 01:32:38 +0100 (Fri, 01 Dec 2006) | 695 lines
r119383 | chaoyingfu | 2006-12-01 01:05:26 +0100 (Fri, 01 Dec 2006) | 528 lines
r119370 | chaoyingfu | 2006-11-30 19:30:26 +0100 (Thu, 30 Nov 2006) | 851 lines
r119352 | chaoyingfu | 2006-11-30 02:57:54 +0100 (Thu, 30 Nov 2006) | 794 lines
r119351 | chaoyingfu | 2006-11-30 02:23:04 +0100 (Thu, 30 Nov 2006) | 942 lines
r114659 | bkoz | 2006-06-15 01:09:51 +0200 (Thu, 15 Jun 2006) | 878 lines
r108152 | rsandifo | 2005-12-07 08:53:14 +0100 (Wed, 07 Dec 2005) | 500 lines
r95152 | mkoch | 2005-02-17 08:48:58 +0100 (Thu, 17 Feb 2005) | 616 lines
r95115 | graydon | 2005-02-16 21:03:29 +0100 (Wed, 16 Feb 2005) | 1998 lines
r94733 | graydon | 2005-02-08 06:22:53 +0100 (Tue, 08 Feb 2005) | 1747 lines
r82314 | graydon | 2004-05-27 08:17:44 +0200 (Thu, 27 May 2004) | 556 lines
r79607 | graydon | 2004-03-17 22:29:02 +0100 (Wed, 17 Mar 2004) | 578 lines
r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines

Total 49 out of 139604. On the other hand there are 187 instances of
"via svnmerge from".

So we can conclude that many people working in branches do not read
http://gcc.gnu.org/wiki/SvnBranch, which is not that surprising. I
think now that matching "via svnmerge from" would be more productive,
so please consider approving my second patch (attached again here).

Cheers,

Manuel.

[-- Attachment #2: pre-commit-ban-svnmerge-logs.diff --]
[-- Type: text/plain, Size: 1571 bytes --]

Index: pre-commit
===================================================================
--- pre-commit	(revision 139590)
+++ pre-commit	(working copy)
@@ -47,7 +47,8 @@
 # If you're having unexpected problems with a hook program, the
 # culprit may be unusual (or missing) environment variables.
 # 
-# Here is an example hook script, for a Unix /bin/sh interpreter.# For more examples and pre-written hooks, see those in
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
 # the Subversion repository at
 # http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
 # http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
@@ -58,9 +59,21 @@
 
 # Make sure that the log message contains some text.
 SVNLOOK=/usr/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPOS" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
 
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "[a-zA-Z0-9]" > /dev/null
+if [ $? -ne 0 ]; then
+    echo "Please include a ChangeLog entry with this commit." >&2
+    exit 1
+fi
+
+# Do not allow log messages
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "via svnmerge from" > /dev/null
+if [ $? -eq 0 ]; then
+    echo "Please, do not use the log generated by svnmerge as a commit log.">&2
+    echo "Read http://gcc.gnu.org/wiki/SvnBranch for more information.     ">&2
+    exit 1
+fi
+
 # Check that the author of this commit has the rights to perform
 # the commit on the files and directories being modified.
 #commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 10:36 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>
>> Can we modify svnmerge to generate an output which will be ignored
>> by "svn ci"?
>
> svnmerge comes with your subversion distribution.
> (e.g., package subversion-tools in Ubuntu)
> We do not control it.
>

Fedora 9 doesn't come with svnmerge. I don't think it is the
part of the regular subversion package.

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

Of 139510 commits, only 12 have more than 500 lines and only 9 have
more than 700. There are two with more than 1000 lines.

r136433 | jakub | 2008-06-06 15:01:54 +0200 (Fri, 06 Jun 2008) | 889 lines
r122168 | bkoz | 2007-02-20 19:15:01 +0100 (Tue, 20 Feb 2007) | 920 lines
r122018 | sandra | 2007-02-16 00:50:49 +0100 (Fri, 16 Feb 2007) | 862 lines
r114659 | bkoz | 2006-06-15 01:09:51 +0200 (Thu, 15 Jun 2006) | 878 lines
r108152 | rsandifo | 2005-12-07 08:53:14 +0100 (Wed, 07 Dec 2005) | 500 lines
r95152 | mkoch | 2005-02-17 08:48:58 +0100 (Thu, 17 Feb 2005) | 616 lines
r95115 | graydon | 2005-02-16 21:03:29 +0100 (Wed, 16 Feb 2005) | 1998 lines
r82314 | graydon | 2004-05-27 08:17:44 +0200 (Thu, 27 May 2004) | 556 lines
r79607 | graydon | 2004-03-17 22:29:02 +0100 (Wed, 17 Mar 2004) | 578 lines
r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines

Anyone can disable the hook script for special cases (it is versioned
after all just "svn co svn+ssh://gcc.gnu.org/svn/gcc/hooks").

Cheers,

Manuel



2008/8/26 Laurent GUERBY <laurent@guerby.net>:
> Out of curiosity did you do a batch scan of existing ChangeLog
> files to see how many entries are above your choosen limit of 500 lines?
>
> Laurent
>
> On Tue, 2008-08-26 at 16:18 +0200, Manuel López-Ibáñez wrote:
>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>> > Could we put a limit to the commit log entry? More than 500 hundred
>> > lines changelog entries should just be rejected and this will avoid
>> > someone accidentally committing a full log or a diff or just random
>> > junk.
>> >
>>
>> The following patch to our pre-commit hook enables this. I have tested
>> it with a dummy repository but review from bourne-shell and/or
>> subversion knowledgeable people would be welcome.
>>
>> Who can approve this?
>>
>> Cheers,
>>
>> Manuel.
>
>

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

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

2008/8/26 Paolo Bonzini <bonzini@gnu.org>:
>> r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
>> r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
>> r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines
>
> These were mistakes, and it's the only three I checked.  100% rate. :-)

I forgot to mention that I ran svn log in trunk only. In branches the
numbers are higher precisely because of the use of automatic logs.
This is the list for the complete repository.

r139372 | xguo | 2008-08-21 08:31:54 +0200 (Thu, 21 Aug 2008) | 706 lines
r139145 | jfreeman | 2008-08-16 04:48:37 +0200 (Sat, 16 Aug 2008) | 19741 lines
r139138 | rus | 2008-08-15 23:37:08 +0200 (Fri, 15 Aug 2008) | 9832 lines
r136433 | jakub | 2008-06-06 15:01:54 +0200 (Fri, 06 Jun 2008) | 889 lines
r125859 | chaoyingfu | 2007-06-19 22:31:53 +0200 (Tue, 19 Jun 2007) | 866 lines
r125840 | chaoyingfu | 2007-06-19 02:42:29 +0200 (Tue, 19 Jun 2007) | 959 lines
r125581 | chaoyingfu | 2007-06-09 00:00:05 +0200 (Sat, 09 Jun 2007) | 3685 lines
r125344 | chaoyingfu | 2007-06-05 23:05:27 +0200 (Tue, 05 Jun 2007) | 965 lines
r125076 | chaoyingfu | 2007-05-26 00:20:57 +0200 (Sat, 26 May 2007) | 517 lines
r124838 | chaoyingfu | 2007-05-19 01:03:14 +0200 (Sat, 19 May 2007) | 895 lines
r124723 | chaoyingfu | 2007-05-14 22:05:48 +0200 (Mon, 14 May 2007) | 858 lines
r124555 | chaoyingfu | 2007-05-08 23:22:26 +0200 (Tue, 08 May 2007) | 822 lines
r124405 | chaoyingfu | 2007-05-04 02:47:49 +0200 (Fri, 04 May 2007) | 1007 lines
r124256 | kargl | 2007-04-28 06:11:29 +0200 (Sat, 28 Apr 2007) | 510 lines
r124241 | chaoyingfu | 2007-04-27 23:37:29 +0200 (Fri, 27 Apr 2007) | 522 lines
r124137 | chaoyingfu | 2007-04-25 02:55:02 +0200 (Wed, 25 Apr 2007) | 1501 lines
r123894 | chaoyingfu | 2007-04-16 22:48:50 +0200 (Mon, 16 Apr 2007) | 1774 lines
r123627 | chaoyingfu | 2007-04-06 22:43:35 +0200 (Fri, 06 Apr 2007) | 3063 lines
r123365 | chaoyingfu | 2007-03-30 20:51:44 +0200 (Fri, 30 Mar 2007) | 679 lines
r123228 | chaoyingfu | 2007-03-26 22:47:45 +0200 (Mon, 26 Mar 2007) | 892 lines
r123097 | chaoyingfu | 2007-03-21 01:15:47 +0100 (Wed, 21 Mar 2007) | 1974 lines
r122862 | chaoyingfu | 2007-03-12 21:12:30 +0100 (Mon, 12 Mar 2007) | 2080 lines
r122629 | chaoyingfu | 2007-03-06 19:08:30 +0100 (Tue, 06 Mar 2007) | 1610 lines
r122357 | chaoyingfu | 2007-02-27 02:35:27 +0100 (Tue, 27 Feb 2007) | 1949 lines
r122168 | bkoz | 2007-02-20 19:15:01 +0100 (Tue, 20 Feb 2007) | 920 lines
r122018 | sandra | 2007-02-16 00:50:49 +0100 (Fri, 16 Feb 2007) | 862 lines
r121624 | chaoyingfu | 2007-02-06 00:06:52 +0100 (Tue, 06 Feb 2007) | 1519 lines
r121327 | chaoyingfu | 2007-01-30 01:43:02 +0100 (Tue, 30 Jan 2007) | 1627 lines
r121062 | chaoyingfu | 2007-01-22 20:42:48 +0100 (Mon, 22 Jan 2007) | 1628 lines
r120866 | chaoyingfu | 2007-01-17 20:16:47 +0100 (Wed, 17 Jan 2007) | 1741 lines
r120377 | chaoyingfu | 2007-01-03 03:12:19 +0100 (Wed, 03 Jan 2007) | 974 lines
r120376 | chaoyingfu | 2007-01-03 02:34:59 +0100 (Wed, 03 Jan 2007) | 805 lines
r119394 | chaoyingfu | 2006-12-01 02:57:22 +0100 (Fri, 01 Dec 2006) | 886 lines
r119392 | chaoyingfu | 2006-12-01 02:01:21 +0100 (Fri, 01 Dec 2006) | 787 lines
r119391 | chaoyingfu | 2006-12-01 01:32:38 +0100 (Fri, 01 Dec 2006) | 695 lines
r119383 | chaoyingfu | 2006-12-01 01:05:26 +0100 (Fri, 01 Dec 2006) | 528 lines
r119370 | chaoyingfu | 2006-11-30 19:30:26 +0100 (Thu, 30 Nov 2006) | 851 lines
r119352 | chaoyingfu | 2006-11-30 02:57:54 +0100 (Thu, 30 Nov 2006) | 794 lines
r119351 | chaoyingfu | 2006-11-30 02:23:04 +0100 (Thu, 30 Nov 2006) | 942 lines
r114659 | bkoz | 2006-06-15 01:09:51 +0200 (Thu, 15 Jun 2006) | 878 lines
r108152 | rsandifo | 2005-12-07 08:53:14 +0100 (Wed, 07 Dec 2005) | 500 lines
r95152 | mkoch | 2005-02-17 08:48:58 +0100 (Thu, 17 Feb 2005) | 616 lines
r95115 | graydon | 2005-02-16 21:03:29 +0100 (Wed, 16 Feb 2005) | 1998 lines
r94733 | graydon | 2005-02-08 06:22:53 +0100 (Tue, 08 Feb 2005) | 1747 lines
r82314 | graydon | 2004-05-27 08:17:44 +0200 (Thu, 27 May 2004) | 556 lines
r79607 | graydon | 2004-03-17 22:29:02 +0100 (Wed, 17 Mar 2004) | 578 lines
r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines

Total 49 out of 139604. On the other hand there are 187 instances of
"via svnmerge from".

So we can conclude that many people working in branches do not read
http://gcc.gnu.org/wiki/SvnBranch, which is not that surprising. I
think now that matching "via svnmerge from" would be more productive,
so please consider approving my second patch (attached again here).

Cheers,

Manuel.

[-- Attachment #2: pre-commit-ban-svnmerge-logs.diff --]
[-- Type: text/plain, Size: 1571 bytes --]

Index: pre-commit
===================================================================
--- pre-commit	(revision 139590)
+++ pre-commit	(working copy)
@@ -47,7 +47,8 @@
 # If you're having unexpected problems with a hook program, the
 # culprit may be unusual (or missing) environment variables.
 # 
-# Here is an example hook script, for a Unix /bin/sh interpreter.# For more examples and pre-written hooks, see those in
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
 # the Subversion repository at
 # http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
 # http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
@@ -58,9 +59,21 @@
 
 # Make sure that the log message contains some text.
 SVNLOOK=/usr/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPOS" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
 
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "[a-zA-Z0-9]" > /dev/null
+if [ $? -ne 0 ]; then
+    echo "Please include a ChangeLog entry with this commit." >&2
+    exit 1
+fi
+
+# Do not allow log messages
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "via svnmerge from" > /dev/null
+if [ $? -eq 0 ]; then
+    echo "Please, do not use the log generated by svnmerge as a commit log.">&2
+    echo "Read http://gcc.gnu.org/wiki/SvnBranch for more information.     ">&2
+    exit 1
+fi
+
 # Check that the author of this commit has the rights to perform
 # the commit on the files and directories being modified.
 #commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Daniel Berlin]

svnmerge has a command line option not to generate those messages.
We don't control the source to svnmerge.


On Tue, Aug 26, 2008 at 1:31 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 9:46 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>> On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
>>> <lopezibanez@gmail.com> wrote:
>>>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>>>>
>>>>> When I add 600 testcases, should I mention each of them in commit log?
>>>>
>>>> 500 was just a number. That said, you could very well do 2 commits of
>>>> 300 testcases.
>>>>
>>>
>>> It will be very odd. I believe some libjava merges updated more than 500
>>> files. If we have to break such checkins into several smaller ones just
>>> because svnmerge can't handle it properly, maybe we should ban
>>> svnmerge instead.
>>>
>>> FWIW, I don't use svnmerge and I never have any problems to
>>> merge between branches with "svn merge".
>>>
>>
>> H.J.,
>>
>> I think you are misunderstanding the problem that this patch is trying to solve.
>>
>> If you do: svn ci -F file
>> subversion will use the contents of 'file' as the commit log that you
>> later can check with 'svn log'.
>> After a merge but before committing svnmerge generates a file with the
>> 'svn log' output of all revisions merged. If you use this file as the
>> commit log, then you (a) make harder to read the output of 'svn log'
>> (b) flood the gcc.gnu.org servers that are parsing your commit log for
>> PR numbers and sending emails to bugzilla and subscribers. The emails
>> are the commit logs, so they are typically a very long email with
>> multiple commits that has no relevance to the receiver.
>
> Can we modify svnmerge to generate an output which will be ignored
> by "svn ci"? Will "svn ci" ignore lines after
>
> --This line, and those below, will be ignored--
>
> if svnmerge puts it at the beginning of its output?
>
> --
> H.J.
>

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Daniel Berlin]

It used to be, but it is now it's own project.
http://www.orcaware.com/svn/wiki/Svnmerge.py

On Tue, Aug 26, 2008 at 1:41 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 10:36 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>>
>>> Can we modify svnmerge to generate an output which will be ignored
>>> by "svn ci"?
>>
>> svnmerge comes with your subversion distribution.
>> (e.g., package subversion-tools in Ubuntu)
>> We do not control it.
>>
>
> Fedora 9 doesn't come with svnmerge. I don't think it is the
> part of the regular subversion package.
>
> --
> H.J.
>

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

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

2008/8/26 Paolo Bonzini <bonzini@gnu.org>:
>> r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
>> r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
>> r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines
>
> These were mistakes, and it's the only three I checked.  100% rate. :-)

I forgot to mention that I ran svn log in trunk only. In branches the
numbers are higher precisely because of the use of automatic logs.
This is the list for the complete repository.

r139372 | xguo | 2008-08-21 08:31:54 +0200 (Thu, 21 Aug 2008) | 706 lines
r139145 | jfreeman | 2008-08-16 04:48:37 +0200 (Sat, 16 Aug 2008) | 19741 lines
r139138 | rus | 2008-08-15 23:37:08 +0200 (Fri, 15 Aug 2008) | 9832 lines
r136433 | jakub | 2008-06-06 15:01:54 +0200 (Fri, 06 Jun 2008) | 889 lines
r125859 | chaoyingfu | 2007-06-19 22:31:53 +0200 (Tue, 19 Jun 2007) | 866 lines
r125840 | chaoyingfu | 2007-06-19 02:42:29 +0200 (Tue, 19 Jun 2007) | 959 lines
r125581 | chaoyingfu | 2007-06-09 00:00:05 +0200 (Sat, 09 Jun 2007) | 3685 lines
r125344 | chaoyingfu | 2007-06-05 23:05:27 +0200 (Tue, 05 Jun 2007) | 965 lines
r125076 | chaoyingfu | 2007-05-26 00:20:57 +0200 (Sat, 26 May 2007) | 517 lines
r124838 | chaoyingfu | 2007-05-19 01:03:14 +0200 (Sat, 19 May 2007) | 895 lines
r124723 | chaoyingfu | 2007-05-14 22:05:48 +0200 (Mon, 14 May 2007) | 858 lines
r124555 | chaoyingfu | 2007-05-08 23:22:26 +0200 (Tue, 08 May 2007) | 822 lines
r124405 | chaoyingfu | 2007-05-04 02:47:49 +0200 (Fri, 04 May 2007) | 1007 lines
r124256 | kargl | 2007-04-28 06:11:29 +0200 (Sat, 28 Apr 2007) | 510 lines
r124241 | chaoyingfu | 2007-04-27 23:37:29 +0200 (Fri, 27 Apr 2007) | 522 lines
r124137 | chaoyingfu | 2007-04-25 02:55:02 +0200 (Wed, 25 Apr 2007) | 1501 lines
r123894 | chaoyingfu | 2007-04-16 22:48:50 +0200 (Mon, 16 Apr 2007) | 1774 lines
r123627 | chaoyingfu | 2007-04-06 22:43:35 +0200 (Fri, 06 Apr 2007) | 3063 lines
r123365 | chaoyingfu | 2007-03-30 20:51:44 +0200 (Fri, 30 Mar 2007) | 679 lines
r123228 | chaoyingfu | 2007-03-26 22:47:45 +0200 (Mon, 26 Mar 2007) | 892 lines
r123097 | chaoyingfu | 2007-03-21 01:15:47 +0100 (Wed, 21 Mar 2007) | 1974 lines
r122862 | chaoyingfu | 2007-03-12 21:12:30 +0100 (Mon, 12 Mar 2007) | 2080 lines
r122629 | chaoyingfu | 2007-03-06 19:08:30 +0100 (Tue, 06 Mar 2007) | 1610 lines
r122357 | chaoyingfu | 2007-02-27 02:35:27 +0100 (Tue, 27 Feb 2007) | 1949 lines
r122168 | bkoz | 2007-02-20 19:15:01 +0100 (Tue, 20 Feb 2007) | 920 lines
r122018 | sandra | 2007-02-16 00:50:49 +0100 (Fri, 16 Feb 2007) | 862 lines
r121624 | chaoyingfu | 2007-02-06 00:06:52 +0100 (Tue, 06 Feb 2007) | 1519 lines
r121327 | chaoyingfu | 2007-01-30 01:43:02 +0100 (Tue, 30 Jan 2007) | 1627 lines
r121062 | chaoyingfu | 2007-01-22 20:42:48 +0100 (Mon, 22 Jan 2007) | 1628 lines
r120866 | chaoyingfu | 2007-01-17 20:16:47 +0100 (Wed, 17 Jan 2007) | 1741 lines
r120377 | chaoyingfu | 2007-01-03 03:12:19 +0100 (Wed, 03 Jan 2007) | 974 lines
r120376 | chaoyingfu | 2007-01-03 02:34:59 +0100 (Wed, 03 Jan 2007) | 805 lines
r119394 | chaoyingfu | 2006-12-01 02:57:22 +0100 (Fri, 01 Dec 2006) | 886 lines
r119392 | chaoyingfu | 2006-12-01 02:01:21 +0100 (Fri, 01 Dec 2006) | 787 lines
r119391 | chaoyingfu | 2006-12-01 01:32:38 +0100 (Fri, 01 Dec 2006) | 695 lines
r119383 | chaoyingfu | 2006-12-01 01:05:26 +0100 (Fri, 01 Dec 2006) | 528 lines
r119370 | chaoyingfu | 2006-11-30 19:30:26 +0100 (Thu, 30 Nov 2006) | 851 lines
r119352 | chaoyingfu | 2006-11-30 02:57:54 +0100 (Thu, 30 Nov 2006) | 794 lines
r119351 | chaoyingfu | 2006-11-30 02:23:04 +0100 (Thu, 30 Nov 2006) | 942 lines
r114659 | bkoz | 2006-06-15 01:09:51 +0200 (Thu, 15 Jun 2006) | 878 lines
r108152 | rsandifo | 2005-12-07 08:53:14 +0100 (Wed, 07 Dec 2005) | 500 lines
r95152 | mkoch | 2005-02-17 08:48:58 +0100 (Thu, 17 Feb 2005) | 616 lines
r95115 | graydon | 2005-02-16 21:03:29 +0100 (Wed, 16 Feb 2005) | 1998 lines
r94733 | graydon | 2005-02-08 06:22:53 +0100 (Tue, 08 Feb 2005) | 1747 lines
r82314 | graydon | 2004-05-27 08:17:44 +0200 (Thu, 27 May 2004) | 556 lines
r79607 | graydon | 2004-03-17 22:29:02 +0100 (Wed, 17 Mar 2004) | 578 lines
r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines

Total 49 out of 139604. On the other hand there are 187 instances of
"via svnmerge from".

So we can conclude that many people working in branches do not read
http://gcc.gnu.org/wiki/SvnBranch, which is not that surprising. I
think now that matching "via svnmerge from" would be more productive,
so please consider approving my second patch (attached again here).

Cheers,

Manuel.

[-- Attachment #2: pre-commit-ban-svnmerge-logs.diff --]
[-- Type: text/plain, Size: 1571 bytes --]

Index: pre-commit
===================================================================
--- pre-commit	(revision 139590)
+++ pre-commit	(working copy)
@@ -47,7 +47,8 @@
 # If you're having unexpected problems with a hook program, the
 # culprit may be unusual (or missing) environment variables.
 # 
-# Here is an example hook script, for a Unix /bin/sh interpreter.# For more examples and pre-written hooks, see those in
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
 # the Subversion repository at
 # http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
 # http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
@@ -58,9 +59,21 @@
 
 # Make sure that the log message contains some text.
 SVNLOOK=/usr/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPOS" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
 
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "[a-zA-Z0-9]" > /dev/null
+if [ $? -ne 0 ]; then
+    echo "Please include a ChangeLog entry with this commit." >&2
+    exit 1
+fi
+
+# Do not allow log messages
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "via svnmerge from" > /dev/null
+if [ $? -eq 0 ]; then
+    echo "Please, do not use the log generated by svnmerge as a commit log.">&2
+    echo "Read http://gcc.gnu.org/wiki/SvnBranch for more information.     ">&2
+    exit 1
+fi
+
 # Check that the author of this commit has the rights to perform
 # the commit on the files and directories being modified.
 #commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
> On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>>
>>> When I add 600 testcases, should I mention each of them in commit log?
>>
>> 500 was just a number. That said, you could very well do 2 commits of
>> 300 testcases.
>>
>
> It will be very odd. I believe some libjava merges updated more than 500
> files. If we have to break such checkins into several smaller ones just
> because svnmerge can't handle it properly, maybe we should ban
> svnmerge instead.
>
> FWIW, I don't use svnmerge and I never have any problems to
> merge between branches with "svn merge".
>

H.J.,

I think you are misunderstanding the problem that this patch is trying to solve.

If you do: svn ci -F file
subversion will use the contents of 'file' as the commit log that you
later can check with 'svn log'.
After a merge but before committing svnmerge generates a file with the
'svn log' output of all revisions merged. If you use this file as the
commit log, then you (a) make harder to read the output of 'svn log'
(b) flood the gcc.gnu.org servers that are parsing your commit log for
PR numbers and sending emails to bugzilla and subscribers. The emails
are the commit logs, so they are typically a very long email with
multiple commits that has no relevance to the receiver.

This is documented in http://gcc.gnu.org/wiki/SvnBranch but everybody
do mistakes.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Daniel Berlin]

svnmerge has a command line option not to generate those messages.
We don't control the source to svnmerge.


On Tue, Aug 26, 2008 at 1:31 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 9:46 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>> On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
>>> <lopezibanez@gmail.com> wrote:
>>>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>>>>
>>>>> When I add 600 testcases, should I mention each of them in commit log?
>>>>
>>>> 500 was just a number. That said, you could very well do 2 commits of
>>>> 300 testcases.
>>>>
>>>
>>> It will be very odd. I believe some libjava merges updated more than 500
>>> files. If we have to break such checkins into several smaller ones just
>>> because svnmerge can't handle it properly, maybe we should ban
>>> svnmerge instead.
>>>
>>> FWIW, I don't use svnmerge and I never have any problems to
>>> merge between branches with "svn merge".
>>>
>>
>> H.J.,
>>
>> I think you are misunderstanding the problem that this patch is trying to solve.
>>
>> If you do: svn ci -F file
>> subversion will use the contents of 'file' as the commit log that you
>> later can check with 'svn log'.
>> After a merge but before committing svnmerge generates a file with the
>> 'svn log' output of all revisions merged. If you use this file as the
>> commit log, then you (a) make harder to read the output of 'svn log'
>> (b) flood the gcc.gnu.org servers that are parsing your commit log for
>> PR numbers and sending emails to bugzilla and subscribers. The emails
>> are the commit logs, so they are typically a very long email with
>> multiple commits that has no relevance to the receiver.
>
> Can we modify svnmerge to generate an output which will be ignored
> by "svn ci"? Will "svn ci" ignore lines after
>
> --This line, and those below, will be ignored--
>
> if svnmerge puts it at the beginning of its output?
>
> --
> H.J.
>

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Richard Guenther]

On Tue, Aug 26, 2008 at 5:06 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>>> Could we put a limit to the commit log entry? More than 500 hundred
>>> lines changelog entries should just be rejected and this will avoid
>>> someone accidentally committing a full log or a diff or just random
>>> junk.
>>>
>>
>> The following patch to our pre-commit hook enables this. I have tested
>> it with a dummy repository but review from bourne-shell and/or
>> subversion knowledgeable people would be welcome.
>>
>
> When I add 600 testcases, should I mention each of them in commit log?

Yes.

IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?

Richard.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 9:46 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>> On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
>> <lopezibanez@gmail.com> wrote:
>>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>>>
>>>> When I add 600 testcases, should I mention each of them in commit log?
>>>
>>> 500 was just a number. That said, you could very well do 2 commits of
>>> 300 testcases.
>>>
>>
>> It will be very odd. I believe some libjava merges updated more than 500
>> files. If we have to break such checkins into several smaller ones just
>> because svnmerge can't handle it properly, maybe we should ban
>> svnmerge instead.
>>
>> FWIW, I don't use svnmerge and I never have any problems to
>> merge between branches with "svn merge".
>>
>
> H.J.,
>
> I think you are misunderstanding the problem that this patch is trying to solve.
>
> If you do: svn ci -F file
> subversion will use the contents of 'file' as the commit log that you
> later can check with 'svn log'.
> After a merge but before committing svnmerge generates a file with the
> 'svn log' output of all revisions merged. If you use this file as the
> commit log, then you (a) make harder to read the output of 'svn log'
> (b) flood the gcc.gnu.org servers that are parsing your commit log for
> PR numbers and sending emails to bugzilla and subscribers. The emails
> are the commit logs, so they are typically a very long email with
> multiple commits that has no relevance to the receiver.

Can we modify svnmerge to generate an output which will be ignored
by "svn ci"? Will "svn ci" ignore lines after

--This line, and those below, will be ignored--

if svnmerge puts it at the beginning of its output?

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> Can we modify svnmerge to generate an output which will be ignored
> by "svn ci"?

svnmerge comes with your subversion distribution.
(e.g., package subversion-tools in Ubuntu)
We do not control it.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 Richard Guenther <richard.guenther@gmail.com>:
>
> IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?

600 lines is *very* long (see the numbers I just sent). We do not want
such large patches in one go. They make regression hunting useless.

But yes, we could balk at the string "via svnmerge from" which I think
is "standard" in logs generated by svnmerge. Would that be acceptable?

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> When I add 600 testcases, should I mention each of them in commit log?

500 was just a number. That said, you could very well do 2 commits of
300 testcases.

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>
> Shouldn't svnmerge be fixed not to generate such log?

svnmerge generates a file, it does not commit that file as a log for
you. In some other project, that file could be the commit log. However
in GCC's repository, committing that file is a mistake that some
people do sometimes. (Everybody does mistakes sometimes).

Cheers,

Manuel.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 10:36 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>
>> Can we modify svnmerge to generate an output which will be ignored
>> by "svn ci"?
>
> svnmerge comes with your subversion distribution.
> (e.g., package subversion-tools in Ubuntu)
> We do not control it.
>

Fedora 9 doesn't come with svnmerge. I don't think it is the
part of the regular subversion package.

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

Of 139510 commits, only 12 have more than 500 lines and only 9 have
more than 700. There are two with more than 1000 lines.

r136433 | jakub | 2008-06-06 15:01:54 +0200 (Fri, 06 Jun 2008) | 889 lines
r122168 | bkoz | 2007-02-20 19:15:01 +0100 (Tue, 20 Feb 2007) | 920 lines
r122018 | sandra | 2007-02-16 00:50:49 +0100 (Fri, 16 Feb 2007) | 862 lines
r114659 | bkoz | 2006-06-15 01:09:51 +0200 (Thu, 15 Jun 2006) | 878 lines
r108152 | rsandifo | 2005-12-07 08:53:14 +0100 (Wed, 07 Dec 2005) | 500 lines
r95152 | mkoch | 2005-02-17 08:48:58 +0100 (Thu, 17 Feb 2005) | 616 lines
r95115 | graydon | 2005-02-16 21:03:29 +0100 (Wed, 16 Feb 2005) | 1998 lines
r82314 | graydon | 2004-05-27 08:17:44 +0200 (Thu, 27 May 2004) | 556 lines
r79607 | graydon | 2004-03-17 22:29:02 +0100 (Wed, 17 Mar 2004) | 578 lines
r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines

Anyone can disable the hook script for special cases (it is versioned
after all just "svn co svn+ssh://gcc.gnu.org/svn/gcc/hooks").

Cheers,

Manuel



2008/8/26 Laurent GUERBY <laurent@guerby.net>:
> Out of curiosity did you do a batch scan of existing ChangeLog
> files to see how many entries are above your choosen limit of 500 lines?
>
> Laurent
>
> On Tue, 2008-08-26 at 16:18 +0200, Manuel López-Ibáñez wrote:
>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>> > Could we put a limit to the commit log entry? More than 500 hundred
>> > lines changelog entries should just be rejected and this will avoid
>> > someone accidentally committing a full log or a diff or just random
>> > junk.
>> >
>>
>> The following patch to our pre-commit hook enables this. I have tested
>> it with a dummy repository but review from bourne-shell and/or
>> subversion knowledgeable people would be welcome.
>>
>> Who can approve this?
>>
>> Cheers,
>>
>> Manuel.
>
>

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Paolo Bonzini]

> r76701 | amylaar | 2004-01-27 13:49:31 +0100 (Tue, 27 Jan 2004) | 2915 lines
> r55189 | amylaar | 2002-07-02 20:45:49 +0200 (Tue, 02 Jul 2002) | 684 lines
> r43861 | kenner | 2001-07-09 13:20:51 +0200 (Mon, 09 Jul 2001) | 980 lines

These were mistakes, and it's the only three I checked.  100% rate. :-)

Paolo

[PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[Manuel López-Ibáñez]

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

2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
> Could we put a limit to the commit log entry? More than 500 hundred
> lines changelog entries should just be rejected and this will avoid
> someone accidentally committing a full log or a diff or just random
> junk.
>

The following patch to our pre-commit hook enables this. I have tested
it with a dummy repository but review from bourne-shell and/or
subversion knowledgeable people would be welcome.

Who can approve this?

Cheers,

Manuel.

[-- Attachment #2: pre-commit.diff --]
[-- Type: text/plain, Size: 1723 bytes --]

Index: pre-commit
===================================================================
--- pre-commit	(revision 139590)
+++ pre-commit	(working copy)
@@ -47,7 +47,8 @@
 # If you're having unexpected problems with a hook program, the
 # culprit may be unusual (or missing) environment variables.
 # 
-# Here is an example hook script, for a Unix /bin/sh interpreter.# For more examples and pre-written hooks, see those in
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
 # the Subversion repository at
 # http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
 # http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
@@ -58,9 +59,23 @@
 
 # Make sure that the log message contains some text.
 SVNLOOK=/usr/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPOS" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
 
+$SVNLOOK log -t "$TXN" "$REPOS" | grep "[a-zA-Z0-9]" > /dev/null
+if [ $? -ne 0 ]; then
+    echo "Please include a ChangeLog entry with this commit." >&2
+    exit 1
+fi
+
+# Do not allow log messages
+LOGLINES=`$SVNLOOK log -t "$TXN" "$REPOS" | wc -l`
+if test $LOGLINES -gt 500; then
+    echo "A single ChangeLog entry cannot be larger than 500 lines.       " >&2
+    echo "Please check again the log message of this commit.              " >&2
+    echo "If you are merging from/to a branch, never use log messages from" >&2
+    echo "other revisions as the commit message.                          " >&2
+    exit 1
+fi
+
 # Check that the author of this commit has the rights to perform
 # the commit on the files and directories being modified.
 #commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
<lopezibanez@gmail.com> wrote:
> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>
>> When I add 600 testcases, should I mention each of them in commit log?
>
> 500 was just a number. That said, you could very well do 2 commits of
> 300 testcases.
>

It will be very odd. I believe some libjava merges updated more than 500
files. If we have to break such checkins into several smaller ones just
because svnmerge can't handle it properly, maybe we should ban
svnmerge instead.

FWIW, I don't use svnmerge and I never have any problems to
merge between branches with "svn merge".

-- 
H.J.

Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)

[H.J. Lu]

On Tue, Aug 26, 2008 at 8:36 AM, Richard Guenther
<richard.guenther@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 5:06 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>> On Tue, Aug 26, 2008 at 7:18 AM, Manuel López-Ibáñez
>> <lopezibanez@gmail.com> wrote:
>>> 2008/8/16 Manuel López-Ibáñez <lopezibanez@gmail.com>:
>>>> Could we put a limit to the commit log entry? More than 500 hundred
>>>> lines changelog entries should just be rejected and this will avoid
>>>> someone accidentally committing a full log or a diff or just random
>>>> junk.
>>>>
>>>
>>> The following patch to our pre-commit hook enables this. I have tested
>>> it with a dummy repository but review from bourne-shell and/or
>>> subversion knowledgeable people would be welcome.
>>>
>>
>> When I add 600 testcases, should I mention each of them in commit log?
>
> Yes.
>
> IMHO 600 lines is too short.  Can't we simply detect svnmerge logs somehow?
>

Shouldn't svnmerge be fixed not to generate such log?


-- 
H.J.