equal
deleted
inserted
replaced
9 from cStringIO import StringIO |
9 from cStringIO import StringIO |
10 from mercurial import encoding, util |
10 from mercurial import encoding, util |
11 from mercurial.i18n import _ |
11 from mercurial.i18n import _ |
12 |
12 |
13 from common import NoRepo, commit, converter_source, checktool |
13 from common import NoRepo, commit, converter_source, checktool |
|
14 from common import makedatetimestamp |
14 import cvsps |
15 import cvsps |
15 |
16 |
16 class convert_cvs(converter_source): |
17 class convert_cvs(converter_source): |
17 def __init__(self, ui, path, rev=None): |
18 def __init__(self, ui, path, rev=None): |
18 super(convert_cvs, self).__init__(ui, path, rev=rev) |
19 super(convert_cvs, self).__init__(ui, path, rev=rev) |
68 break |
69 break |
69 id = str(cs.id) |
70 id = str(cs.id) |
70 cs.author = self.recode(cs.author) |
71 cs.author = self.recode(cs.author) |
71 self.lastbranch[cs.branch] = id |
72 self.lastbranch[cs.branch] = id |
72 cs.comment = self.recode(cs.comment) |
73 cs.comment = self.recode(cs.comment) |
|
74 if self.ui.configbool('convert', 'localtimezone'): |
|
75 cs.date = makedatetimestamp(cs.date[0]) |
73 date = util.datestr(cs.date, '%Y-%m-%d %H:%M:%S %1%2') |
76 date = util.datestr(cs.date, '%Y-%m-%d %H:%M:%S %1%2') |
74 self.tags.update(dict.fromkeys(cs.tags, id)) |
77 self.tags.update(dict.fromkeys(cs.tags, id)) |
75 |
78 |
76 files = {} |
79 files = {} |
77 for f in cs.entries: |
80 for f in cs.entries: |