equal
deleted
inserted
replaced
751 islink='l' in flags, |
751 islink='l' in flags, |
752 isexec='x' in flags, |
752 isexec='x' in flags, |
753 copied=copied.get(path)) |
753 copied=copied.get(path)) |
754 return mctx |
754 return mctx |
755 raise IOError() |
755 raise IOError() |
756 if commitopts.get('message') and commitopts.get('logfile'): |
756 |
757 raise util.Abort(_('options --message and --logfile are mutually' |
757 message = cmdutil.logmessage(repo.ui, commitopts) |
758 ' exclusive')) |
758 if not message: |
759 if commitopts.get('logfile'): |
|
760 message= open(commitopts['logfile']).read() |
|
761 elif commitopts.get('message'): |
|
762 message = commitopts['message'] |
|
763 else: |
|
764 message = old.description() |
759 message = old.description() |
765 |
760 |
766 user = commitopts.get('user') or old.user() |
761 user = commitopts.get('user') or old.user() |
767 date = commitopts.get('date') or None # old.date() |
762 date = commitopts.get('date') or None # old.date() |
768 extra = dict(commitopts.get('extra', {})) |
763 extra = dict(commitopts.get('extra', {})) |