Show More
@@ -280,7 +280,7 b' class converter(object):' | |||||
280 | def writeauthormap(self): |
|
280 | def writeauthormap(self): | |
281 | authorfile = self.authorfile |
|
281 | authorfile = self.authorfile | |
282 | if authorfile: |
|
282 | if authorfile: | |
283 |
self.ui.status(_(' |
|
283 | self.ui.status(_('writing author map file %s\n') % authorfile) | |
284 | ofile = open(authorfile, 'w+') |
|
284 | ofile = open(authorfile, 'w+') | |
285 | for author in self.authors: |
|
285 | for author in self.authors: | |
286 | ofile.write("%s=%s\n" % (author, self.authors[author])) |
|
286 | ofile.write("%s=%s\n" % (author, self.authors[author])) | |
@@ -297,7 +297,7 b' class converter(object):' | |||||
297 | try: |
|
297 | try: | |
298 | srcauthor, dstauthor = line.split('=', 1) |
|
298 | srcauthor, dstauthor = line.split('=', 1) | |
299 | except ValueError: |
|
299 | except ValueError: | |
300 |
msg = _(' |
|
300 | msg = _('ignoring bad line in author map file %s: %s\n') | |
301 | self.ui.warn(msg % (authorfile, line.rstrip())) |
|
301 | self.ui.warn(msg % (authorfile, line.rstrip())) | |
302 | continue |
|
302 | continue | |
303 |
|
303 |
@@ -227,7 +227,7 b' class svn_source(converter_source):' | |||||
227 | raise NoRepo(_("%s does not look like a Subversion repository") |
|
227 | raise NoRepo(_("%s does not look like a Subversion repository") | |
228 | % url) |
|
228 | % url) | |
229 | if svn is None: |
|
229 | if svn is None: | |
230 |
raise MissingTool(_(' |
|
230 | raise MissingTool(_('could not load Subversion python bindings')) | |
231 |
|
231 | |||
232 | try: |
|
232 | try: | |
233 | version = svn.core.SVN_VER_MAJOR, svn.core.SVN_VER_MINOR |
|
233 | version = svn.core.SVN_VER_MAJOR, svn.core.SVN_VER_MINOR |
@@ -22,12 +22,12 b' Explicit --authors' | |||||
22 | > EOF |
|
22 | > EOF | |
23 | $ hg convert --authors authormap.txt orig new |
|
23 | $ hg convert --authors authormap.txt orig new | |
24 | initializing destination new repository |
|
24 | initializing destination new repository | |
25 |
|
|
25 | ignoring bad line in author map file authormap.txt: this line is ignored | |
26 | scanning source... |
|
26 | scanning source... | |
27 | sorting... |
|
27 | sorting... | |
28 | converting... |
|
28 | converting... | |
29 | 0 foo |
|
29 | 0 foo | |
30 |
|
|
30 | writing author map file $TESTTMP/new/.hg/authormap | |
31 | $ cat new/.hg/authormap |
|
31 | $ cat new/.hg/authormap | |
32 | user name=Long User Name |
|
32 | user name=Long User Name | |
33 | $ hg -Rnew log |
|
33 | $ hg -Rnew log | |
@@ -44,7 +44,7 b' Implicit .hg/authormap' | |||||
44 | $ hg init new |
|
44 | $ hg init new | |
45 | $ mv authormap.txt new/.hg/authormap |
|
45 | $ mv authormap.txt new/.hg/authormap | |
46 | $ hg convert orig new |
|
46 | $ hg convert orig new | |
47 |
|
|
47 | ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored | |
48 | scanning source... |
|
48 | scanning source... | |
49 | sorting... |
|
49 | sorting... | |
50 | converting... |
|
50 | converting... |
General Comments 0
You need to be logged in to leave comments.
Login now