[PATCH 2 of 4] convert: Avoid redundant newline on authormap errors
Marti Raudsepp
marti at juffo.org
Thu Feb 28 09:46:35 CST 2008
# HG changeset patch
# User Marti Raudsepp <marti at juffo.org>
# Date 1204213076 -7200
# Node ID fe6aef431a01450e9bfab704986bbfb7a7fe40a6
# Parent 530bc921339a53a1498ec175cd6e4bf4f31617a1
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 530bc921339a -r fe6aef431a01 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 @@ class converter(object):
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):
More information about the Mercurial-devel
mailing list