equal
deleted
inserted
replaced
775 message = ui.fin.read() |
775 message = ui.fin.read() |
776 else: |
776 else: |
777 message = '\n'.join(util.readfile(logfile).splitlines()) |
777 message = '\n'.join(util.readfile(logfile).splitlines()) |
778 except IOError as inst: |
778 except IOError as inst: |
779 raise error.Abort(_("can't read commit message '%s': %s") % |
779 raise error.Abort(_("can't read commit message '%s': %s") % |
780 (logfile, inst.strerror)) |
780 (logfile, encoding.strtolocal(inst.strerror))) |
781 return message |
781 return message |
782 |
782 |
783 def mergeeditform(ctxorbool, baseformname): |
783 def mergeeditform(ctxorbool, baseformname): |
784 """return appropriate editform name (referencing a committemplate) |
784 """return appropriate editform name (referencing a committemplate) |
785 |
785 |
1097 if inst.errno == errno.ENOENT: |
1097 if inst.errno == errno.ENOENT: |
1098 ui.warn(_('%s: deleted in working directory\n') % relsrc) |
1098 ui.warn(_('%s: deleted in working directory\n') % relsrc) |
1099 srcexists = False |
1099 srcexists = False |
1100 else: |
1100 else: |
1101 ui.warn(_('%s: cannot copy - %s\n') % |
1101 ui.warn(_('%s: cannot copy - %s\n') % |
1102 (relsrc, inst.strerror)) |
1102 (relsrc, encoding.strtolocal(inst.strerror))) |
1103 return True # report a failure |
1103 return True # report a failure |
1104 |
1104 |
1105 if ui.verbose or not exact: |
1105 if ui.verbose or not exact: |
1106 if rename: |
1106 if rename: |
1107 ui.status(_('moving %s to %s\n') % (relsrc, reltarget)) |
1107 ui.status(_('moving %s to %s\n') % (relsrc, reltarget)) |