Show More
@@ -5,9 +5,9 b'' | |||||
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 |
import os |
|
8 | import os, re, socket, errno | |
9 | from cStringIO import StringIO |
|
9 | from cStringIO import StringIO | |
10 | from mercurial import 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 | |
@@ -30,7 +30,7 b' class convert_cvs(converter_source):' | |||||
30 | self.socket = None |
|
30 | self.socket = None | |
31 | self.cvsroot = open(os.path.join(cvs, "Root")).read()[:-1] |
|
31 | self.cvsroot = open(os.path.join(cvs, "Root")).read()[:-1] | |
32 | self.cvsrepo = open(os.path.join(cvs, "Repository")).read()[:-1] |
|
32 | self.cvsrepo = open(os.path.join(cvs, "Repository")).read()[:-1] | |
33 |
self.encoding = |
|
33 | self.encoding = encoding.encoding | |
34 |
|
34 | |||
35 | self._connect() |
|
35 | self._connect() | |
36 |
|
36 |
@@ -8,8 +8,8 b'' | |||||
8 |
|
8 | |||
9 | from common import NoRepo, commandline, commit, converter_source |
|
9 | from common import NoRepo, commandline, commit, converter_source | |
10 | from mercurial.i18n import _ |
|
10 | from mercurial.i18n import _ | |
11 | from mercurial import util |
|
11 | from mercurial import encoding, util | |
12 |
import os, shutil, tempfile, stat |
|
12 | import os, shutil, tempfile, stat | |
13 | from email.Parser import Parser |
|
13 | from email.Parser import Parser | |
14 |
|
14 | |||
15 | class gnuarch_source(converter_source, commandline): |
|
15 | class gnuarch_source(converter_source, commandline): | |
@@ -55,7 +55,7 b' class gnuarch_source(converter_source, c' | |||||
55 | self.parents = {} |
|
55 | self.parents = {} | |
56 | self.tags = {} |
|
56 | self.tags = {} | |
57 | self.catlogparser = Parser() |
|
57 | self.catlogparser = Parser() | |
58 |
self.encoding = |
|
58 | self.encoding = encoding.encoding | |
59 | self.archives = [] |
|
59 | self.archives = [] | |
60 |
|
60 | |||
61 | def before(self): |
|
61 | def before(self): |
General Comments 0
You need to be logged in to leave comments.
Login now