Style of commit messages

2007-04-16 Thread Henrik Nordstrom
Please follow the following style in your commit messages

First if the primary author of the patch isn't you then have a line
indicating the autor of the change

Author: Name email

Next a short summary of the change. Approximately one line.

Then a blank line

Followed by a full description of the change.


The first two lines (Author:, and the summary) is picked up by the
changeset tools.


This applies to both CVS repositories, both the devel.squid-cache.org
aka SourceForge, and the main repository.

http://www.squid-cache.org/Versions/v2/HEAD/changesets/
http://www.squid-cache.org/Versions/v3/3.0/changesets/
http://devel.squid-cache.org/changesets/

Regards
Henrik


signature.asc
Description: Detta är en digitalt signerad	meddelandedel


Re: Style of commit messages

2007-04-16 Thread Adrian Chadd
On Mon, Apr 16, 2007, Henrik Nordstrom wrote:
 Please follow the following style in your commit messages
 
 First if the primary author of the patch isn't you then have a line
 indicating the autor of the change
 
 Author: Name email
 
 Next a short summary of the change. Approximately one line.
 
 Then a blank line
 
 Followed by a full description of the change.
 
 
 The first two lines (Author:, and the summary) is picked up by the
 changeset tools.

Could you put this into the default CVS commit templates?




Adrian



Re: Style of commit messages

2007-04-16 Thread Henrik Nordstrom
mån 2007-04-16 klockan 15:24 +0800 skrev Adrian Chadd:
 On Mon, Apr 16, 2007, Henrik Nordstrom wrote:
  Please follow the following style in your commit messages
  
  First if the primary author of the patch isn't you then have a line
  indicating the autor of the change
  
  Author: Name email
  
  Next a short summary of the change. Approximately one line.
  
  Then a blank line
  
  Followed by a full description of the change.
  
  
  The first two lines (Author:, and the summary) is picked up by the
  changeset tools.
 
 Could you put this into the default CVS commit templates?

Done. But will only be available on fresh checkouts. (CVS stupidity).

Stored as CVS/Template in your local working directory.

Regards
Henrik


signature.asc
Description: Detta är en digitalt signerad	meddelandedel


Re: Style of commit messages

2007-04-16 Thread Henrik Nordstrom
mån 2007-04-16 klockan 10:34 +0200 skrev Henrik Nordstrom:

 Done. But will only be available on fresh checkouts. (CVS stupidity).
 
 Stored as CVS/Template in your local working directory.

Hmm.. only works if you run cvs commit from a directory where the
CVS/Template file exists, not if run from a sub-directory such as src..

Regards
Henrik


signature.asc
Description: Detta är en digitalt signerad	meddelandedel


Re: Style of commit messages

2007-04-16 Thread Amos Jeffries

Adrian Chadd wrote:

On Mon, Apr 16, 2007, Henrik Nordstrom wrote:

Please follow the following style in your commit messages

First if the primary author of the patch isn't you then have a line
indicating the autor of the change

Author: Name email

Next a short summary of the change. Approximately one line.

Then a blank line

Followed by a full description of the change.


The first two lines (Author:, and the summary) is picked up by the
changeset tools.


Could you put this into the default CVS commit templates?

Adrian




While you are adjusting cvs

  is there a good reason for the squid-cvs email being in default diff 
format?


I think we would all find it a little more useful reading and using 
updates if that email could be a unified diff.


Amos


Re: Style of commit messages

2007-04-16 Thread Gonzalo Arana

On 4/16/07, Henrik Nordstrom [EMAIL PROTECTED] wrote:

...

The first two lines (Author:, and the summary) is picked up by the
changeset tools.


This applies to both CVS repositories, both the devel.squid-cache.org
aka SourceForge, and the main repository.

http://www.squid-cache.org/Versions/v2/HEAD/changesets/
http://www.squid-cache.org/Versions/v3/3.0/changesets/
http://devel.squid-cache.org/changesets/


Just a cosmetic improvement to changesets table:

[style type=text/css]
td { white-space: nowrap }
[/style]

(angular brackets replaced by square brackets)

This makes changesets html tables more readable.

Regards,

--
Gonzalo A. Arana


cppunit removal

2007-04-16 Thread Amos Jeffries

AUTHOR: Ams Jeffries [EMAIL PROTECTED]

The squid 3.0 will not be packaged with cppunit 1.10.0.

The developers have decided that the packaging of cppunit within the 
squid sources has caused more trouble than was solved. Ease of install 
independently of squid combined with the apparently widespread use of 
cppunit as a standard tool we feel there is no need for it to be included.


For the initial release to date there will be no replacement testing 
package and no automatic install for cppunit unless one is added by OS 
distribution maintainers.


Squid releases already makes an attempt to detect external installs of 
cppunit and use those by preference over the packaged version. This 
existing detection has been left in place and will enable testing on any 
system with cppunit. Maintainers and source testers will need to have 
cppunit installed on their systems or not use make check.


Patch file generated Tue Apr 17 00:18:17 NZST 2007 from
CVS branch nocpp
CVS base branch HEAD
CVS repository: [EMAIL PROTECTED]:/cvsroot/squid
CVS module: squid3

cvs -q rdiff -u -kk -r Z-nocpp_merge_HEAD -r nocpp squid3
Index: squid3/bootstrap.sh
diff -u squid3/bootstrap.sh:1.20 squid3/bootstrap.sh:1.20.6.2
--- squid3/bootstrap.sh:1.20Mon Mar 20 19:15:31 2006
+++ squid3/bootstrap.sh Fri Apr 13 03:57:49 2007
@@ -66,8 +66,7 @@

 for dir in \
 \
-   lib/libTrie \
-   lib/cppunit-1.10.0
+   lib/libTrie
 do
 if [ -z $dir ] || [ -d $dir ]; then
if (
Index: squid3/configure.in
diff -u squid3/configure.in:1.130 squid3/configure.in:1.129.2.2
--- squid3/configure.in:1.130   Sun Apr 15 08:00:25 2007
+++ squid3/configure.in Mon Apr 16 00:11:34 2007
@@ -1789,17 +1789,17 @@
   SQUID_CPPUNIT_LA=''
   SQUID_CPPUNIT_INC=`$CPPUNITCONFIG --cflags`
 else
-  SQUID_CPPUNIT_DIR='cppunit-1.10.0'
-  SQUID_CPPUNIT_LA='$(top_builddir)/lib/cppunit-1.10.0/src/cppunit/libcppunit.la'
-  SQUID_CPPUNIT_LIBS='$(SQUID_CPPUNIT_LA)'
-  SQUID_CPPUNIT_INC='-I$(top_builddir)/lib/cppunit-1.10.0/include -I $(top_srcdir)/lib/cppunit-1.10.0/include'
+  echo cppunit does not apear to be installed. squid does not require this, but code testing with 'make check' will fail.
+  SQUID_CPPUNIT_DIR=''
+  SQUID_CPPUNIT_LA=''
+  SQUID_CPPUNIT_LIBS=''
+  SQUID_CPPUNIT_INC=''
 fi

 AC_ARG_WITH(cppunit-basedir,
 [  --with-cppunit-basedir=/path/to/cppunit-base
   Path where the cppunit headers are libraries are found
- for unit testing. (defaults to use internal copies -
- version 1.10.0)
+ for unit testing. ('make check' will fail without it)
  ],
 [ if test -f $withval/include/cppunit/TestCase.h; then
echo Using cppunit includes from $withval
@@ -3305,6 +3305,5 @@
 ])

 AC_CONFIG_SUBDIRS(lib/libTrie)
-AC_CONFIG_SUBDIRS(lib/cppunit-1.10.0)

 AC_OUTPUT
Index: squid3/lib/Makefile.am
diff -u squid3/lib/Makefile.am:1.17 squid3/lib/Makefile.am:1.17.2.1
--- squid3/lib/Makefile.am:1.17 Sat Sep  2 06:52:12 2006
+++ squid3/lib/Makefile.am  Fri Apr 13 03:41:49 2007
@@ -3,7 +3,7 @@
 #  $Id$
 #

-DIST_SUBDIRS = libTrie cppunit-1.10.0
+DIST_SUBDIRS = libTrie
 SUBDIRS= libTrie @SQUID_CPPUNIT_DIR@

 install: all


Re: Style of commit messages

2007-04-16 Thread Henrik Nordstrom
tis 2007-04-17 klockan 00:09 +1200 skrev Amos Jeffries:

 While you are adjusting cvs
 
is there a good reason for the squid-cvs email being in default diff 
 format?

Outside our control.

 I think we would all find it a little more useful reading and using 
 updates if that email could be a unified diff.

Fully agreed.

And is what you have in the changesets viewer..

Regards
Henrik


signature.asc
Description: Detta är en digitalt signerad	meddelandedel


Re: cppunit removal

2007-04-16 Thread Henrik Nordstrom
Applied, with some small changes.

http://www.squid-cache.org/Versions/v3/3.0/changesets/10701.patch

Regards
Henrik

tis 2007-04-17 klockan 01:06 +1200 skrev Amos Jeffries:
 AUTHOR: Ams Jeffries [EMAIL PROTECTED]
 
 The squid 3.0 will not be packaged with cppunit 1.10.0.
 
 The developers have decided that the packaging of cppunit within the 
 squid sources has caused more trouble than was solved. Ease of install 
 independently of squid combined with the apparently widespread use of 
 cppunit as a standard tool we feel there is no need for it to be included.
 
 For the initial release to date there will be no replacement testing 
 package and no automatic install for cppunit unless one is added by OS 
 distribution maintainers.
 
 Squid releases already makes an attempt to detect external installs of 
 cppunit and use those by preference over the packaged version. This 
 existing detection has been left in place and will enable testing on any 
 system with cppunit. Maintainers and source testers will need to have 
 cppunit installed on their systems or not use make check.
 


signature.asc
Description: Detta är en digitalt signerad	meddelandedel