Changeset 1317 in tailor for vcpx/repository/darcs/source.py

Timestamp:

02/26/07 21:46:55 (6 years ago)

Author:

lele@…

Hash name:

20070226204655-97f81-f608589c9db6f0887614c66f06d7a41517af7a14

Message:

Use line.rstrip() instead of line[:-1], to better handle non-unix newlines

File:

• vcpx/repository/darcs/source.py (modified) (2 diffs)

vcpx/repository/darcs/source.py

@@ -311 +311 @@
                 # but that assumes the two spaces as separator, so I find the
                 # following solution easier and by any chance faster too.                
-                pieces = l.split('  ')
+                pieces = l.rstrip().split('  ')
                 assert len(pieces)>1, "Cannot parse %r as a patch timestamp" % l
-                author = pieces.pop()[:-1]
+                author = pieces.pop()
                 date = ' '.join(pieces)
                 y,m,d,hh,mm,ss,d1,d2,d3 = strptime(date, "%a %b %d %H:%M:%S %Z %Y")
                 date = datetime(y,m,d,hh,mm,ss,0,UTC)
-                l = output.readline()
+                l = output.readline().rstrip()
                 assert (l.startswith('  * ') or
                         l.startswith('  UNDO:') or
-                        l.startswith('  tagged'))
+                        l.startswith('  tagged')), \
+                        "Got %r but expected the start of the log" % l
 
                 if l.startswith('  *'):
-                    name = l[4:-1]
+                    name = l[4:]
                 else:
-                    name = l[2:-1]
+                    name = l[2:]
 
                 changelog = []
-                l = output.readline()
+                l = output.readline().rstrip()
                 while l.startswith('  '):
-                    changelog.append(l[2:-1])
-                    l = output.readline()
+                    changelog.append(l[2:])
+                    l = output.readline().rstrip()
 
                 cset = Changeset(name, date, author, '\n'.join(changelog))
@@ -356 +357 @@
                     yield cset
 
-                while not l.strip():
-                    l = output.readline()
+                while not l:
+                    l = output.readline().strip()
 
     def _applyChangeset(self, changeset):