Mercurial > hg > hg-fastimport

changeset 31:062425ee334f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
parser: do not blow up if we see EOF right after a 'merge' line.
author Greg Ward <greg-hg@gerg.ca>
date Mon, 04 May 2009 19:37:56 -0400
parents 87873075e128
children 8a92919bcd16
files fastimport/parser.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/fastimport/parser.py	Mon May 04 11:30:04 2009 -0400
+++ b/fastimport/parser.py	Mon May 04 19:37:56 2009 -0400
@@ -405,7 +405,9 @@
     def _get_merge(self):
         """Parse a merge section."""
         line = self.next_line()
-        if line.startswith('merge '):
+        if line is None:                # EOF after last "merge" line
+            return None
+        elif line.startswith('merge '):
             return line[len('merge '):]
         else:
             #print "not a merge:", line