##// END OF EJS Templates
commit: keep opts as byteskwargs as much as possible...
Augie Fackler -
r31534:2abba506 default
parent child Browse files
Show More
@@ -1636,10 +1636,12 b' def commit(ui, repo, *pats, **opts):'
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
@@ -1711,7 +1713,8 b' def _docommit(ui, repo, *pats, **opts):'
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'),
General Comments 0
You need to be logged in to leave comments. Login now