# HG changeset patch # User Marti Raudsepp # Date 1204213076 -7200 # Node ID c48d778d7c23f1fc2851319df5741013d5f960b4 # Parent 9d13e712942318ef414086015709805f826e3d2e convert: Avoid redundant newline on authormap errors. The extra rstrip is necessary in case the file has uses different line terminators (i.e. CRLF). diff -r 9d13e7129423 -r c48d778d7c23 hgext/convert/convcmd.py --- a/hgext/convert/convcmd.py Thu Feb 28 17:37:56 2008 +0200 +++ b/hgext/convert/convcmd.py Thu Feb 28 17:37:56 2008 +0200 @@ -206,8 +206,8 @@ self.authors[srcauthor] = dstauthor except IndexError: self.ui.warn( - 'Ignoring bad line in author file map %s: %s\n' - % (authorfile, line)) + 'Ignoring bad line in author map file %s: %s\n' + % (authorfile, line.rstrip())) afile.close() def cachecommit(self, rev):