comparison mercurial/cmdutil.py @ 14249:f4766e1bb0b3

cmdutil: normalize log message eols when reading from file This will be necessary once util.readfile() operates in binary mode. While changelog.add() already normalizes the message, doing so in logmessage() is required as ui.edit() or others expect messages with LF only.
author Patrick Mezard <pmezard@gmail.com>
date Sat, 07 May 2011 21:12:33 +0200
parents df2399663392
children d035ede73434
comparison
equal deleted inserted replaced
14248:25c68ac247c1 14249:f4766e1bb0b3
89 if not message and logfile: 89 if not message and logfile:
90 try: 90 try:
91 if logfile == '-': 91 if logfile == '-':
92 message = sys.stdin.read() 92 message = sys.stdin.read()
93 else: 93 else:
94 message = util.readfile(logfile) 94 message = '\n'.join(util.readfile(logfile).splitlines())
95 except IOError, inst: 95 except IOError, inst:
96 raise util.Abort(_("can't read commit message '%s': %s") % 96 raise util.Abort(_("can't read commit message '%s': %s") %
97 (logfile, inst.strerror)) 97 (logfile, inst.strerror))
98 return message 98 return message
99 99