equal
deleted
inserted
replaced
491 if message and logfile: |
491 if message and logfile: |
492 raise error.Abort(_('options --message and --logfile are mutually ' |
492 raise error.Abort(_('options --message and --logfile are mutually ' |
493 'exclusive')) |
493 'exclusive')) |
494 if not message and logfile: |
494 if not message and logfile: |
495 try: |
495 try: |
496 if logfile == '-': |
496 if isstdiofilename(logfile): |
497 message = ui.fin.read() |
497 message = ui.fin.read() |
498 else: |
498 else: |
499 message = '\n'.join(util.readfile(logfile).splitlines()) |
499 message = '\n'.join(util.readfile(logfile).splitlines()) |
500 except IOError as inst: |
500 except IOError as inst: |
501 raise error.Abort(_("can't read commit message '%s': %s") % |
501 raise error.Abort(_("can't read commit message '%s': %s") % |