RE: Log data for branches

[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 <address@hidden>, under the GNU GPL.
--- 8,15 ----
  ###                                                        ###
  ##############################################################
  
! ## $Revision: 1.2 $
! ## $Date: 2002/11/22 21:29:49 $
  ## $Author: rhb $
  ##
  ##   (C) 1999 Karl Fogel <address@hidden>, 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-header        Blank line between each header and log
message
    --no-wrap                    Don't auto-wrap log message (recommend -S
also)
    --gmt, --utc                 Show times in GMT/UTC instead of local time