equal
deleted
inserted
replaced
643 e = cmdutil.commiteditor |
643 e = cmdutil.commiteditor |
644 if opts.get('force_editor'): |
644 if opts.get('force_editor'): |
645 e = cmdutil.commitforceeditor |
645 e = cmdutil.commitforceeditor |
646 |
646 |
647 def commitfunc(ui, repo, message, match, opts): |
647 def commitfunc(ui, repo, message, match, opts): |
648 return repo.commit(None, message, opts.get('user'), |
648 return repo.commit(message, opts.get('user'), opts.get('date'), match, |
649 opts.get('date'), match, editor=e, extra=extra) |
649 editor=e, extra=extra) |
650 |
650 |
651 node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
651 node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
652 if not node: |
652 if not node: |
653 return |
653 return |
654 cl = repo.changelog |
654 cl = repo.changelog |
1752 files=files) |
1752 files=files) |
1753 finally: |
1753 finally: |
1754 files = patch.updatedir(ui, repo, files, similarity=sim/100.) |
1754 files = patch.updatedir(ui, repo, files, similarity=sim/100.) |
1755 if not opts.get('no_commit'): |
1755 if not opts.get('no_commit'): |
1756 m = cmdutil.matchfiles(repo, files or []) |
1756 m = cmdutil.matchfiles(repo, files or []) |
1757 n = repo.commit(None, message, opts.get('user') or user, |
1757 n = repo.commit(message, opts.get('user') or user, |
1758 opts.get('date') or date, match=m, |
1758 opts.get('date') or date, match=m, |
1759 editor=cmdutil.commiteditor) |
1759 editor=cmdutil.commiteditor) |
1760 if opts.get('exact'): |
1760 if opts.get('exact'): |
1761 if hex(n) != nodeid: |
1761 if hex(n) != nodeid: |
1762 repo.rollback() |
1762 repo.rollback() |