From 854bbac98024ae1e27b9e56f34b698e82ebaf6e0 Mon Sep 17 00:00:00 2001
From: mhagger <mhagger@be7e6eca-30d4-0310-a8e5-ac0d63af7087>
Date: Mon, 6 Apr 2015 07:05:18 +0000
Subject: [PATCH] Update to rcsparse r2971.

This addresses an edge case if EOF is encountered while parsing a
token.

git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5461 be7e6eca-30d4-0310-a8e5-ac0d63af7087
---
 cvs2svn_rcsparse/LICENSE.html    | 5 ++++-
 cvs2svn_rcsparse/UPSTREAM_SOURCE | 2 +-
 cvs2svn_rcsparse/common.py       | 2 +-
 cvs2svn_rcsparse/debug.py        | 2 +-
 cvs2svn_rcsparse/default.py      | 6 +++++-
 cvs2svn_rcsparse/texttools.py    | 2 +-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/cvs2svn_rcsparse/LICENSE.html b/cvs2svn_rcsparse/LICENSE.html
index 94ba9ae3..8bcb4c6c 100644
--- a/cvs2svn_rcsparse/LICENSE.html
+++ b/cvs2svn_rcsparse/LICENSE.html
@@ -15,7 +15,7 @@
 
 <blockquote>
 
-<p><strong>Copyright &copy; 1999-2011 The ViewCVS Group.  All rights
+<p><strong>Copyright &copy; 1999-2014 The ViewCVS Group.  All rights
    reserved.</strong></p>
 
 <p>By using ViewVC, you agree to the terms and conditions set forth
@@ -62,6 +62,9 @@
   <li>March 18, 2009 &mdash; copyright years updated</li>
   <li>March 29, 2010 &mdash; copyright years updated</li>
   <li>February 18, 2011 &mdash; copyright years updated</li>
+  <li>January 23, 2012 &mdash; copyright years updated</li>
+  <li>January 04, 2013 &mdash; copyright years updated</li>
+  <li>May 02, 2014 &mdash; copyright years updated</li>
 </ul>
 
 </body>
diff --git a/cvs2svn_rcsparse/UPSTREAM_SOURCE b/cvs2svn_rcsparse/UPSTREAM_SOURCE
index 8f5eb27d..17ed9307 100644
--- a/cvs2svn_rcsparse/UPSTREAM_SOURCE
+++ b/cvs2svn_rcsparse/UPSTREAM_SOURCE
@@ -1 +1 @@
-http://viewvc.tigris.org/svn/viewvc/trunk/lib/vclib/ccvs/rcsparse@2576
+http://viewvc.tigris.org/svn/viewvc/trunk/lib/vclib/ccvs/rcsparse@2971
diff --git a/cvs2svn_rcsparse/common.py b/cvs2svn_rcsparse/common.py
index a4911f1a..d99ce97c 100644
--- a/cvs2svn_rcsparse/common.py
+++ b/cvs2svn_rcsparse/common.py
@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2011 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
 #
 # By using this file, you agree to the terms and conditions set forth in
 # the LICENSE.html file which can be found at the top level of the ViewVC
diff --git a/cvs2svn_rcsparse/debug.py b/cvs2svn_rcsparse/debug.py
index cfeaf2b6..c0f693fe 100644
--- a/cvs2svn_rcsparse/debug.py
+++ b/cvs2svn_rcsparse/debug.py
@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
 #
 # By using this file, you agree to the terms and conditions set forth in
 # the LICENSE.html file which can be found at the top level of the ViewVC
diff --git a/cvs2svn_rcsparse/default.py b/cvs2svn_rcsparse/default.py
index 5face4ca..24825e9a 100644
--- a/cvs2svn_rcsparse/default.py
+++ b/cvs2svn_rcsparse/default.py
@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2008 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
 #
 # By using this file, you agree to the terms and conditions set forth in
 # the LICENSE.html file which can be found at the top level of the ViewVC
@@ -87,6 +87,10 @@ class _TokenStream:
 
         # we stopped at the end of the buffer, so we may have a partial token
         buf = self.rcsfile.read(self.CHUNK_SIZE)
+        if buf == '':
+          # signal EOF by returning None as the token
+          del self.buf   # so we fail if get() is called again
+          return None
         lbuf = len(buf)
         idx = end = 0
 
diff --git a/cvs2svn_rcsparse/texttools.py b/cvs2svn_rcsparse/texttools.py
index 03387194..a0a21568 100644
--- a/cvs2svn_rcsparse/texttools.py
+++ b/cvs2svn_rcsparse/texttools.py
@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2008 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
 #
 # By using this file, you agree to the terms and conditions set forth in
 # the LICENSE.html file which can be found at the top level of the ViewVC
-- 
2.11.4.GIT