changeset 6185:c48d778d7c23

convert: Avoid redundant newline on authormap errors. The extra rstrip is necessary in case the file has uses different line terminators (i.e. CRLF).
author Marti Raudsepp <marti@juffo.org>
date Thu, 28 Feb 2008 17:37:56 +0200
parents 9d13e7129423
children aae4eb2f40b0
files hgext/convert/convcmd.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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):