summaryrefslogtreecommitdiff
path: root/marks_file.py
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-02-02 11:34:22 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-02-02 11:34:22 +0100
commit033d11df05af3ed87c811a5ff08c33a54ad849f1 (patch)
treefba28c2e92b8b8cc4ac0e11285d2d1be534ef6e5 /marks_file.py
parent385d2c46a803b5af8823e432b858b7786da4ebdf (diff)
parentbc1a6e0f831ae24acfe98f5dbdc76b034e492e35 (diff)
downloadbzr-fastimport-033d11df05af3ed87c811a5ff08c33a54ad849f1.tar.gz
Fix incremental imports from incremental input streams.
Diffstat (limited to 'marks_file.py')
-rw-r--r--marks_file.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/marks_file.py b/marks_file.py
index c05f8c6..7066a1c 100644
--- a/marks_file.py
+++ b/marks_file.py
@@ -53,8 +53,7 @@ def import_marks(filename):
while line:
line = line.rstrip('\n')
mark, revid = line.split(' ', 1)
- if mark.startswith(':'):
- mark = mark[1:]
+ mark = mark.lstrip(':')
revision_ids[mark] = revid
line = f.readline()
f.close()
@@ -76,5 +75,5 @@ def export_marks(filename, revision_ids):
# Write the revision info
for mark, revid in revision_ids.iteritems():
- f.write(':%s %s\n' % (mark, revid))
+ f.write(':%s %s\n' % (str(mark).lstrip(':'), revid))
f.close()