1634 return _docommit(ui, repo, *pats, **opts) |
1634 return _docommit(ui, repo, *pats, **opts) |
1635 finally: |
1635 finally: |
1636 release(lock, wlock) |
1636 release(lock, wlock) |
1637 |
1637 |
1638 def _docommit(ui, repo, *pats, **opts): |
1638 def _docommit(ui, repo, *pats, **opts): |
|
1639 opts = pycompat.byteskwargs(opts) |
1639 if opts.get('interactive'): |
1640 if opts.get('interactive'): |
1640 opts.pop('interactive') |
1641 opts.pop('interactive') |
1641 ret = cmdutil.dorecord(ui, repo, commit, None, False, |
1642 ret = cmdutil.dorecord(ui, repo, commit, None, False, |
1642 cmdutil.recordfilter, *pats, **opts) |
1643 cmdutil.recordfilter, *pats, |
|
1644 **pycompat.strkwargs(opts)) |
1643 # ret can be 0 (no changes to record) or the value returned by |
1645 # ret can be 0 (no changes to record) or the value returned by |
1644 # commit(), 1 if nothing changed or None on success. |
1646 # commit(), 1 if nothing changed or None on success. |
1645 return 1 if ret == 0 else ret |
1647 return 1 if ret == 0 else ret |
1646 |
1648 |
1647 if opts.get('subrepos'): |
1649 if opts.get('subrepos'): |
1709 baseui = repo.baseui |
1711 baseui = repo.baseui |
1710 with baseui.configoverride(overrides, 'commit'): |
1712 with baseui.configoverride(overrides, 'commit'): |
1711 with ui.configoverride(overrides, 'commit'): |
1713 with ui.configoverride(overrides, 'commit'): |
1712 editform = cmdutil.mergeeditform(repo[None], |
1714 editform = cmdutil.mergeeditform(repo[None], |
1713 'commit.normal') |
1715 'commit.normal') |
1714 editor = cmdutil.getcommiteditor(editform=editform, **opts) |
1716 editor = cmdutil.getcommiteditor( |
|
1717 editform=editform, **pycompat.strkwargs(opts)) |
1715 return repo.commit(message, |
1718 return repo.commit(message, |
1716 opts.get('user'), |
1719 opts.get('user'), |
1717 opts.get('date'), |
1720 opts.get('date'), |
1718 match, |
1721 match, |
1719 editor=editor, |
1722 editor=editor, |