convert: display source revision id with --verbose

This commit is contained in:
Patrick Mezard 2008-01-26 14:45:04 +01:00
parent b6fdc96f71
commit 8eb60ebaa2
3 changed files with 12 additions and 3 deletions

View File

@ -230,6 +230,10 @@ class converter(object):
self.map[rev] = newnode
def convert(self):
def recode(s):
return s.decode('utf-8').encode(orig_encoding, 'replace')
try:
self.source.before()
self.dest.before()
@ -251,8 +255,8 @@ class converter(object):
# convert log message to local encoding without using
# tolocal() because util._encoding conver() use it as
# 'utf-8'
desc = desc.decode('utf-8').encode(orig_encoding, 'replace')
self.ui.status("%d %s\n" % (num, desc))
self.ui.status("%d %s\n" % (num, recode(desc)))
self.ui.note(_("source: %s\n" % recode(c)))
self.copy(c)
tags = self.source.gettags()

View File

@ -49,7 +49,7 @@ svn ci -m changeb
cd ..
echo % test incremental conversion
hg convert $svnurl
hg convert -v $svnurl | sed 's/source:.*/source:/'
echo % test filemap
echo 'include b' > filemap

View File

@ -26,9 +26,14 @@ Committed revision 3.
% test incremental conversion
assuming destination test-hg
scanning source...
fetching revision log for "/trunk/test" from 3 to 2
sorting...
converting...
0 changeb
source:
a
b
no tags found at revision 3
% test filemap
initializing destination fmap repository
scanning source...