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