diff options
Diffstat (limited to 'hgext/convert/cvs.py')
| -rw-r--r-- | hgext/convert/cvs.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hgext/convert/cvs.py b/hgext/convert/cvs.py index 38b1d34..d07ea20 100644 --- a/hgext/convert/cvs.py +++ b/hgext/convert/cvs.py @@ -70,7 +70,7 @@ class convert_cvs(converter_source): cs.author = self.recode(cs.author) self.lastbranch[cs.branch] = id cs.comment = self.recode(cs.comment) - date = util.datestr(cs.date, '%Y-%m-%d %H:%M:%S %1%2') + date = util.datestr(cs.date) self.tags.update(dict.fromkeys(cs.tags, id)) files = {} @@ -121,13 +121,12 @@ class convert_cvs(converter_source): pf = open(cvspass) for line in pf.read().splitlines(): part1, part2 = line.split(' ', 1) - # /1 :pserver:user@example.com:2401/cvsroot/foo - # Ah<Z if part1 == '/1': + # /1 :pserver:user@example.com:2401/cvsroot/foo Ah<Z part1, part2 = part2.split(' ', 1) format = format1 - # :pserver:user@example.com:/cvsroot/foo Ah<Z else: + # :pserver:user@example.com:/cvsroot/foo Ah<Z format = format0 if part1 == format: passw = part2 |