##// END OF EJS Templates
convert: fix line ending of mapfile and commit.desc file...
Yuya Nishihara -
r36166:0f9e52f9 default
parent child Browse files
Show More
@@ -476,7 +476,7 b' class mapfile(dict):'
476 476 raise error.Abort(
477 477 _('could not open map file %r: %s') %
478 478 (self.path, encoding.strtolocal(err.strerror)))
479 self.fp.write('%s %s\n' % (key, value))
479 self.fp.write(util.tonativeeol('%s %s\n' % (key, value)))
480 480 self.fp.flush()
481 481 super(mapfile, self).__setitem__(key, value)
482 482
@@ -411,7 +411,8 b' class converter(object):'
411 411 self.ui.status(_('writing author map file %s\n') % authorfile)
412 412 ofile = open(authorfile, 'wb+')
413 413 for author in self.authors:
414 ofile.write("%s=%s\n" % (author, self.authors[author]))
414 ofile.write(util.tonativeeol("%s=%s\n"
415 % (author, self.authors[author])))
415 416 ofile.close()
416 417
417 418 def readauthormap(self, authorfile):
@@ -626,7 +626,7 b' class mercurial_source(common.converter_'
626 626 def converted(self, rev, destrev):
627 627 if self.convertfp is None:
628 628 self.convertfp = open(self.repo.vfs.join('shamap'), 'ab')
629 self.convertfp.write('%s %s\n' % (destrev, rev))
629 self.convertfp.write(util.tonativeeol('%s %s\n' % (destrev, rev)))
630 630 self.convertfp.flush()
631 631
632 632 def before(self):
@@ -640,7 +640,8 b' class svn_source(converter_source):'
640 640 if self.convertfp is None:
641 641 self.convertfp = open(os.path.join(self.wc, '.svn', 'hg-shamap'),
642 642 'ab')
643 self.convertfp.write('%s %d\n' % (destrev, self.revnum(rev)))
643 self.convertfp.write(util.tonativeeol('%s %d\n'
644 % (destrev, self.revnum(rev))))
644 645 self.convertfp.flush()
645 646
646 647 def revid(self, revnum, module=None):
@@ -1309,7 +1310,7 b' class svn_sink(converter_sink, commandli'
1309 1310
1310 1311 fd, messagefile = tempfile.mkstemp(prefix='hg-convert-')
1311 1312 fp = os.fdopen(fd, pycompat.sysstr('wb'))
1312 fp.write(commit.desc)
1313 fp.write(util.tonativeeol(commit.desc))
1313 1314 fp.close()
1314 1315 try:
1315 1316 output = self.run0('commit',
General Comments 0
You need to be logged in to leave comments. Login now