Show More
@@ -230,6 +230,10 b' class converter(object):' | |||||
230 | self.map[rev] = newnode |
|
230 | self.map[rev] = newnode | |
231 |
|
231 | |||
232 | def convert(self): |
|
232 | def convert(self): | |
|
233 | ||||
|
234 | def recode(s): | |||
|
235 | return s.decode('utf-8').encode(orig_encoding, 'replace') | |||
|
236 | ||||
233 | try: |
|
237 | try: | |
234 | self.source.before() |
|
238 | self.source.before() | |
235 | self.dest.before() |
|
239 | self.dest.before() | |
@@ -251,8 +255,8 b' class converter(object):' | |||||
251 | # convert log message to local encoding without using |
|
255 | # convert log message to local encoding without using | |
252 | # tolocal() because util._encoding conver() use it as |
|
256 | # tolocal() because util._encoding conver() use it as | |
253 | # 'utf-8' |
|
257 | # 'utf-8' | |
254 | desc = desc.decode('utf-8').encode(orig_encoding, 'replace') |
|
258 | self.ui.status("%d %s\n" % (num, recode(desc))) | |
255 |
self.ui. |
|
259 | self.ui.note(_("source: %s\n" % recode(c))) | |
256 | self.copy(c) |
|
260 | self.copy(c) | |
257 |
|
261 | |||
258 | tags = self.source.gettags() |
|
262 | tags = self.source.gettags() |
@@ -49,7 +49,7 b' svn ci -m changeb' | |||||
49 | cd .. |
|
49 | cd .. | |
50 |
|
50 | |||
51 | echo % test incremental conversion |
|
51 | echo % test incremental conversion | |
52 | hg convert $svnurl |
|
52 | hg convert -v $svnurl | sed 's/source:.*/source:/' | |
53 |
|
53 | |||
54 | echo % test filemap |
|
54 | echo % test filemap | |
55 | echo 'include b' > filemap |
|
55 | echo 'include b' > filemap |
@@ -26,9 +26,14 b' Committed revision 3.' | |||||
26 | % test incremental conversion |
|
26 | % test incremental conversion | |
27 | assuming destination test-hg |
|
27 | assuming destination test-hg | |
28 | scanning source... |
|
28 | scanning source... | |
|
29 | fetching revision log for "/trunk/test" from 3 to 2 | |||
29 | sorting... |
|
30 | sorting... | |
30 | converting... |
|
31 | converting... | |
31 | 0 changeb |
|
32 | 0 changeb | |
|
33 | source: | |||
|
34 | a | |||
|
35 | b | |||
|
36 | no tags found at revision 3 | |||
32 | % test filemap |
|
37 | % test filemap | |
33 | initializing destination fmap repository |
|
38 | initializing destination fmap repository | |
34 | scanning source... |
|
39 | scanning source... |
General Comments 0
You need to be logged in to leave comments.
Login now