rlog complains about commitids from CVS

[Bruno Haible]

Hi,

I'm using 'rlog' to get a list of tags that apply to a ,v file from a
CVS repository. (Why? Because what I have is actually a bunch of ,v files,
not a complete CVS repository. It's complicated to set up the repository
structure around it. 'rlog' as a single-file tool fits better.)

Newer versions of 'cvs' store a 'commitid' with every commit. 'rlog' complains
about it with a message to stderr:

  $ rlog config.rpath,v > /dev/null 
  rlog: config.rpath,v: warning: Unknown phrases like `commitid ...;' are 
present.

I would suggest to ignore this phrase without a warning. Here is a proposed
patch:


2010-05-16  Bruno Haible  <address@hidden>

        * rcssyn.c (K_commitid): New constant.
        (getdelta): Read and ignore a 'commitid' line, if present.

*** rcs-5.7/src/rcssyn.c.bak    1995-06-16 08:19:24.000000000 +0200
--- rcs-5.7/src/rcssyn.c        2010-05-16 02:45:43.000000000 +0200
***************
*** 187,193 ****
  #if COMPAT2
        Ksuffix[]   = "suffix",
  #endif
!       K_branches[]= "branches";
  
  static struct buf Commleader;
  struct cbuf Comment;
--- 187,194 ----
  #if COMPAT2
        Ksuffix[]   = "suffix",
  #endif
!       K_branches[]= "branches",
!       K_commitid[]= "commitid";
  
  static struct buf Commleader;
  struct cbuf Comment;
***************
*** 430,435 ****
--- 431,442 ----
        getkey(Knext);
        Delta->next = num = getdnum();
        getsemi(Knext);
+ 
+       if (getkeyopt(K_commitid)) {
+               getid();
+               getsemi(K_commitid);
+       }
+ 
        Delta->lockedby = 0;
        Delta->log.string = 0;
        Delta->selector = true;

rlog-fix.diff
Description: Text Data

config.rpath,v
Description: Text document