Re: cvs2svn.py fails converting repository with the attached file

On Thu, Jun 26, 2003 at 01:15:49PM -0400, mark benedetto king wrote:
>...
> +++ tools/cvs2svn/rcsparse/common.py Thu Jun 26 13:10:43 2003
> @@ -153,11 +153,16 @@
> timestamp = compat.timegm(tuple(date_fields))
>
> # Parse author
> - semi, author, sym = self.ts.mget(3)
> + sym = self.ts.get()

We can optimistically grab all three tokens. If 'semi' is not a semicolon,
then we can assume it is a second part for the author, append them, and grab
another token looking for the semicolon.

> if sym != 'author':
> raise RCSExpected(sym, 'author')
> - if semi != ';':
> - raise RCSExpected(semi, ';')
> + author = ''
> + while 1:
> + token = self.ts.get()
> + if token == ';':
> + break
> + author = author + token + ' '
> + author = author[:-1]

I would favor an assumption of a single extra token for the author, rather
than an unbounded loop. Note that these loops are quite sensitive to
performance, too. That was the whole purpose for introducing .mget() :-)

Something like:

  semi, author, sym = self.ts.mget(3)
  if sym != 'author':
    raise RCSExpected(sym, 'author')
  if semi != ';':
    ### some comment goes here about how broken the file is that we're
    ### reading, but we'll be Nice People and give it a shot.
    author = author + ' ' + semi
    semi = self.ts.get()
    if semi != ';':
      raise RCSExpected(semi, ';')
  
  # Parse state
  ...

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org