equal
deleted
inserted
replaced
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 |