RE: Log data for branches

2003-03-26 Thread Mike Ayers 

> From: Eric Siegerman [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, March 25, 2003 6:23 PM

> On Tue, Mar 25, 2003 at 05:34:08PM -0800, Mike Ayers wrote:
> > Hmmm - not the results I got...
> >
> > cvs server: invalid option -- S
> > Usage: cvs server [-lRhtNb] [-r[revisions]] [-d dates] [-s states]
> 
> Note who's complaining -- "cvs server", not "cvs log".
> 
> Your client may be 1.11.5, but your server must be older.  Try
> "cvs version" instead of "cvs -v"; the former prints out the
> server's CVS version too.

Whoops!  Missed that.  Well, that hangs that (for now), as I have no option to 
upgrade the server.  Hopefully Douglas will get his changes mailed in, or, if not, I 
can always patch my version.


/|/|ike


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Log data for branches

2003-03-25 Thread Eric Siegerman 
On Tue, Mar 25, 2003 at 05:34:08PM -0800, Mike Ayers wrote:
>   Hmmm - not the results I got...
>
> cvs server: invalid option -- S
> Usage: cvs server [-lRhtNb] [-r[revisions]] [-d dates] [-s states]

Note who's complaining -- "cvs server", not "cvs log".

Your client may be 1.11.5, but your server must be older.  Try
"cvs version" instead of "cvs -v"; the former prints out the
server's CVS version too.

--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED]
|  |  /
A distributed system is one on which I cannot get any work done,
because a machine I have never heard of has crashed.
- Leslie Lamport


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Log data for branches

2003-03-25 Thread Mike Ayers 

> From: Eric Siegerman [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, March 25, 2003 4:56 PM

> In 1.11.5, on that file, "cvs log -rbranch1" would have
> suppressed the revisions, though it would still have printed the
> header information.  The new(ish?) -S option would have
> suppressed the header as well, leaving only the warning.

Hmmm - not the results I got...


=SNIPPAGE BELOW=8<-

C:\mike\wrk\btest\branch1\z1>\ftp\CVS\cvs-1.11.5\cvs -v

Concurrent Versions System (CVS) 1.11.5 (client)

Copyright (c) 1989-2002 Brian Berliner, david d `zoo' zuhn,
Jeff Polk, and other authors

CVS may be copied only under the terms of the GNU General Public License,
a copy of which can be found with the CVS distribution kit.

Specify the --help option for further information about CVS

C:\mike\wrk\btest\branch1\z1>\ftp\CVS\cvs-1.11.5\cvs log -rbranch1
? SwingApplication$1.class
? SwingApplication$2.class
? SwingApplication.class
? SwingApplication3$1.class
? SwingApplication3.class
? SwingApplication3.java
? c1.txt
cvs server: Logging .

RCS file: /export/cvs/personal/mayers/testing123/z1/SwingApplication.java,v
Working file: SwingApplication.java
head: 1.2
branch:
locks: strict
access list:
symbolic names:
branch1: 1.1.0.2
keyword substitution: kv
total revisions: 5; selected revisions: 3
description:

revision 1.1.2.3
date: 2003/03/25 22:45:07;  author: mayers;  state: Exp;  lines: +1 -1
Enough space to count to at least 999.

revision 1.1.2.2
date: 2003/03/25 22:43:17;  author: mayers;  state: Exp;  lines: +4 -3
Improved feedback

revision 1.1.2.1
date: 2003/03/25 21:19:37;  author: mayers;  state: Exp;  lines: +2 -2
Button push paradigm
=
cvs server: warning: no revision `branch1' in `/export/cvs/personal/mayers/testi
ng123/z1/SwingApplication2.java,v'

RCS file: /export/cvs/personal/mayers/testing123/z1/SwingApplication2.java,v
Working file: SwingApplication2.java
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2; selected revisions: 2
description:

revision 1.2
date: 2003/03/25 22:48:26;  author: mayers;  state: Exp;  lines: +4 -3
Better label.

revision 1.1
date: 2003/03/25 22:30:56;  author: mayers;  state: Exp;
countdown version: initial checkin
=

C:\mike\wrk\btest\branch1\z1>\ftp\CVS\cvs-1.11.5\cvs log -rbranch1 -S
? SwingApplication$1.class
? SwingApplication$2.class
? SwingApplication.class
? SwingApplication3$1.class
? SwingApplication3.class
? SwingApplication3.java
? c1.txt
cvs server: invalid option -- S
Usage: cvs server [-lRhtNb] [-r[revisions]] [-d dates] [-s states]
[-w[logins]] [files...]
-l  Local directory only, no recursion.
-R  Only print name of RCS file.
-h  Only print header.
-t  Only print header and descriptive text.
-N  Do not list tags.
-b  Only list revisions on the default branch.
-r[revisions]   Specify revision(s)s to list.
   rev1:rev2   Between rev1 and rev2, including rev1 and rev2.
   rev1::rev2  Between rev1 and rev2, excluding rev1 and rev2.
   rev:rev and following revisions on the same branch.
   rev::   After rev on the same branch.
   :revrev and previous revisions on the same branch.
   ::rev   Before rev on the same branch.
   rev Just rev.
   branch  All revisions on the branch.
   branch. The last revision on the branch.
-d datesSpecify dates (D1


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Log data for branches

2003-03-25 Thread Eric Siegerman 
On Tue, Mar 25, 2003 at 03:20:50PM -0800, Mike Ayers wrote:
> ["cvs log -rbranch1", on a file without the branch, says:]
>
> cvs server: warning: no revision `branch1' in 
> `/export/cvs/personal/mayers/testing123/z1/SwingApplication2.java,v'
>
> RCS file: /export/cvs/personal/mayers/testing123/z1/SwingApplication2.java,v
> [...]
> description:
> 
> revision 1.2
> date: 2003/03/25 22:48:26;  author: mayers;  state: Exp;  lines: +4 -3
> Better label.
> 
> revision 1.1
> date: 2003/03/25 22:30:56;  author: mayers;  state: Exp;
> countdown version: initial checkin
> =

In 1.11.5, on that file, "cvs log -rbranch1" would have
suppressed the revisions, though it would still have printed the
header information.  The new(ish?) -S option would have
suppressed the header as well, leaving only the warning.

--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED]
|  |  /
A distributed system is one on which I cannot get any work done,
because a machine I have never heard of has crashed.
- Leslie Lamport


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Log data for branches

2003-03-25 Thread Mike Ayers 

> From: Douglas Finkle [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, March 25, 2003 3:32 PM

> I have been meaning to get this back to Karl Fogel.


Actually, you should send it to [EMAIL PROTECTED]  I don't think Karl is the 
maintainer anymore.  I'll get my diffs done as well, in case they want to incorporate 
them, and maybe I can get my reports out of the box soon!


Thanks,

/|/|ike

P.S.  I interpret this to mean that the issue has been raised and addressed in the 
past, and the resolution was that the behavior will not change, yes?


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Log data for branches

2003-03-25 Thread Douglas Finkle 
I have been meaning to get this back to Karl Fogel.  This is what
we did:

===
RCS file: /system/cvsroot/buildsvc/src/cvs2cl.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** buildsvc/src/cvs2cl.pl2002/05/21 19:20:541.1
--- buildsvc/src/cvs2cl.pl2002/11/22 21:29:491.2
***
*** 8,15 
  ######
  ##
  
! ## $Revision: 1.1 $
! ## $Date: 2002/05/21 19:20:54 $
  ## $Author: rhb $
  ##
  ##   (C) 1999 Karl Fogel <[EMAIL PROTECTED]>, under the GNU GPL.
--- 8,15 
  ######
  ##
  
! ## $Revision: 1.2 $
! ## $Date: 2002/11/22 21:29:49 $
  ## $Author: rhb $
  ##
  ##   (C) 1999 Karl Fogel <[EMAIL PROTECTED]>, under the GNU GPL.
***
*** 78,84 
  my $Log_Source_Command = "cvs log";
  
  # In case we have to print it out:
! my $VERSION = '$Revision: 1.1 $';
  $VERSION =~ s/\S+\s+(\S+)\s+\S+/$1/;
  
  ## Vars set by options:
--- 78,84 
  my $Log_Source_Command = "cvs log";
  
  # In case we have to print it out:
! my $VERSION = '$Revision: 1.2 $';
  $VERSION =~ s/\S+\s+(\S+)\s+\S+/$1/;
  
  ## Vars set by options:
***
*** 187,192 
--- 187,193 
  # within a file:
  my $logmsg_separator = "";
  
+ my $No_Ancestors = 0;
  
  ### End globals 
  
***
*** 398,404 
goto dengo;
  }
  # Non-trivial case: check if rev is ancestral to branch
! elsif ((length ($branch_number)) > (length ($revision)))
  {
$revision =~ /^((?:\d+\.)+)(\d+)$/;
my $r_left = $1;  # still has the trailing "."
--- 399,405 
goto dengo;
  }
  # Non-trivial case: check if rev is ancestral to branch
! elsif (((length ($branch_number)) > (length ($revision))) &&
!$No_Ancestors)
  {
$revision =~ /^((?:\d+\.)+)(\d+)$/;
my $r_left = $1;  # still has the trailing "."
***
*** 1604,1609 
--- 1605,1613 
$Hide_Filenames = 1;
$After_Header = "";
  }
+ elsif ($arg =~ /^--no-ancestors/) {
+   $No_Ancestors = 1;
+ }
  else {
# Just add a filename as argument to the log command
$Log_Source_Command .= " $arg";
***
*** 1741,1746 
--- 1745,1751 
-I REGEXP, --ignore REGEXP   Ignore files whose names match REGEXP
-C, --case-insensitive   Any regexp matching is done
case-insensitively
-F BRANCH, --follow BRANCH   Show only revisions on or ancestral to
BRANCH
+   --no-ancestors   When using -F, only track changes since the
BRANCH started
-S, --separate-headerBlank line between each header and log
message
--no-wrapDon't auto-wrap log message (recommend -S
also)
--gmt, --utc Show times in GMT/UTC instead of local time

 


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Log data for branches

2003-03-25 Thread Mike Ayers 

I created a test project to illustrate a problem that I am having.  I added a 
file, SwingApplication.java, then branched branch1.  I made some changes in 
SwingApplication.java for both files, then added a new file, SwingApplication2.java, 
on the main branch.

Here's the log output:



C:\mike\wrk\btest\branch1\z1>cvs log
? SwingApplication$1.class
? SwingApplication$2.class
? SwingApplication.class
cvs server: Logging .

RCS file: /export/cvs/personal/mayers/testing123/z1/SwingApplication.java,v
Working file: SwingApplication.java
head: 1.2
branch:
locks: strict
access list:
symbolic names:
branch1: 1.1.0.2
keyword substitution: kv
total revisions: 5; selected revisions: 5
description:

revision 1.2
date: 2003/03/25 21:15:01;  author: mayers;  state: Exp;  lines: +1 -1
Says "Click Me!" now.

revision 1.1
date: 2003/03/25 21:10:06;  author: mayers;  state: Exp;
branches:  1.1.2;
Initial checkin

revision 1.1.2.3
date: 2003/03/25 22:45:07;  author: mayers;  state: Exp;  lines: +1 -1
Enough space to count to at least 999.

revision 1.1.2.2
date: 2003/03/25 22:43:17;  author: mayers;  state: Exp;  lines: +4 -3
Improved feedback

revision 1.1.2.1
date: 2003/03/25 21:19:37;  author: mayers;  state: Exp;  lines: +2 -2
Button push paradigm
=

RCS file: /export/cvs/personal/mayers/testing123/z1/SwingApplication2.java,v
Working file: SwingApplication2.java
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2; selected revisions: 2
description:

revision 1.2
date: 2003/03/25 22:48:26;  author: mayers;  state: Exp;  lines: +4 -3
Better label.

revision 1.1
date: 2003/03/25 22:30:56;  author: mayers;  state: Exp;
countdown version: initial checkin
=



Looks good.  Now, I want to get a log of checkins for files on the "branch1" 
branch:



C:\mike\wrk\btest\branch1\z1>cvs log -rbranch1
? SwingApplication$1.class
? SwingApplication$2.class
? SwingApplication.class
cvs server: Logging .

RCS file: /export/cvs/personal/mayers/testing123/z1/SwingApplication.java,v
Working file: SwingApplication.java
head: 1.2
branch:
locks: strict
access list:
symbolic names:
branch1: 1.1.0.2
keyword substitution: kv
total revisions: 5; selected revisions: 3
description:

revision 1.1.2.3
date: 2003/03/25 22:45:07;  author: mayers;  state: Exp;  lines: +1 -1
Enough space to count to at least 999.

revision 1.1.2.2
date: 2003/03/25 22:43:17;  author: mayers;  state: Exp;  lines: +4 -3
Improved feedback

revision 1.1.2.1
date: 2003/03/25 21:19:37;  author: mayers;  state: Exp;  lines: +2 -2
Button push paradigm
=
cvs server: warning: no revision `branch1' in `/export/cvs/personal/mayers/testi
ng123/z1/SwingApplication2.java,v'

RCS file: /export/cvs/personal/mayers/testing123/z1/SwingApplication2.java,v
Working file: SwingApplication2.java
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2; selected revisions: 2
description:

revision 1.2
date: 2003/03/25 22:48:26;  author: mayers;  state: Exp;  lines: +4 -3
Better label.

revision 1.1
date: 2003/03/25 22:30:56;  author: mayers;  state: Exp;
countdown version: initial checkin
=

C:\mike\wrk\btest\branch1\z1>



Note what happened for SwingApplication2.java - a warning was printed, then 
all file checkins were displayed.  This is the problem.  When I run cvs2cl.pl on my 
branch, I am getting all the checkins on files not on the branch which didn't exist 
when the branch was created.

How can I limit logging to files which exist on a branch?


Thanks,

/|/|ike
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs