Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 10 Mar 1997 11:52:45 +0800
From:      Peter Wemm <peter@spinner.DIALix.COM>
To:        Nate Williams <nate@mt.sri.com>
Cc:        Mike Pritchard <mpp@freefall.freebsd.org>, yokota@zodiac.mech.utsunomiya-u.ac.jp (Kazutaka YOKOTA), joerg@freebsd.org, CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-sys@freefall.freebsd.org
Subject:   Re: cvs commit: src/sys/i386/isa kbdio.c 
Message-ID:  <199703100352.LAA05036@spinner.DIALix.COM>
In-Reply-To: Your message of "Sun, 09 Mar 1997 09:18:30 MST." <199703091618.JAA22931@rocky.mt.sri.com> 

next in thread | previous in thread | raw e-mail | index | archive | help
Nate Williams wrote:
> > > >  YAMFC - at last, kbdio with keyboard/mouse data queues is brought
> > > >  to 2.2.
> > > >  
> > > >  Revision  Changes    Path
> > > >  1.141.2.8 +2 -1      src/sys/i386/conf/files.i386
> > > 
> > > Ugh, Why is "Branch sys/i386/... RELENG_2_2" line absent? Again ;-(
> 
> ...
> 
> > You need to chckout the entire "sys" module.  Checking out just
> > a part of a module causes the Branch line to not be reported
> > in the log message.
> 
> This is supposedly fixed in CVS 1.9.  I've got to do more testing, but
> we're using it at work and it works fine.  I'm going to be branching
> some stuff soon, so hopefully I'll be able to know for sure then.
> 
> 
> Nate

The big problem with cvs-1.9 is that the logging formats are changed..  
The custom logging code that we use to collect a commit that is spread 
over multiple directories into a single message depends pretty heavily on 
the format of the message fed into the script.  It now feeds the branch 
changes in with the filenames, but in a format that is rather difficult to 
parse.

This is what it looks like:

Before (<= cvs 1.8.?):

======
Update of /tmp/foocvs/CVSROOT
In directory spinner.DIALix.COM:/tmp/bar/CVSROOT

Revision/Branch: FOO

Modified Files:
	loginfo editinfo verifymsg
Log Message:
asdfas
======

After (cvs 1.9+) (various examples):

======
Update of /tmp/foocvs/CVSROOT
In directory spinner.DIALix.COM:/tmp/bar/CVSROOT

Modified Files:
      Tag: FOO
	editinfo 
Log Message:
askdfasf

Update of /tmp/foocvs/CVSROOT
In directory spinner.DIALix.COM:/tmp/bar/CVSROOT

Modified Files:
      Tag: FOO
	commitinfo 
      No tag
	loginfo 
      Tag: FOO
	verifymsg 
Log Message:
test1

Update of /tmp/foocvs/CVSROOT
In directory spinner.DIALix.COM:/tmp/bar/CVSROOT

Modified Files:
      Tag: FOO
	commitinfo verifymsg 
Log Message:
asdfasf
======

The current logging script records the branch of each directory..  That no 
longer has meaning under cvs-1.9, so the log message needs a redesign.

Perhaps, looking at a recent commit:
==
bde         97/03/09 05:57:34

  Modified:    sys/i386/include  asm.h asmacros.h
  Log:
  Moved userland assembler macros from <machine/asmacros.h> to
  <machine/asm.h>.
  
  Revision  Changes    Path
  1.2       +82 -1     src/sys/i386/include/asm.h
  1.15      +1 -89     src/sys/i386/include/asmacros.h
==

Perhaps this could be changed to:
==
bde         97/03/09 05:57:34

  Moved userland assembler macros from <machine/asmacros.h> to
  <machine/asm.h>.
  
  Revision  Changes    Branch       Path
  1.2       +82 -1                  src/sys/i386/include/asm.h
  1.15      +1 -89                  src/sys/i386/include/asmacros.h
==

ie: record any tag next to each file, remove the list of files before the 
log message, and make sure that added/deleted files get an entry down the 
bottom.

So, we'd have things like:
  Revision  Changes    Branch       Path
  1.1       +89 Add                 src/sys/i386/include/asm.h
  1.3.4.1   +82 -1     RELENG_2_2   src/sys/i386/include/asm.h
  1.7       Delete                  src/sys/i386/include/asm.h

Perhaps the "Branch" column could only appear when needed and be adjusted
to the necessary size?  And while here, we could do something about the
long subject lines.. (The number of lines in a 'cvs add' is easy to get,
the number deleted isn't so simple)

Cheers,
-Peter





Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199703100352.LAA05036>