This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2410

py3: use pycompat.byteskwargs() to fix keyword arguments handling
ClosedPublic

Authored by pulkit on Feb 24 2018, 4:40 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGdbf34d0ef9f6: py3: use pycompat.byteskwargs() to fix keyword arguments handling
Summary

I missed these when I fixed keyword arguments handling in the whole file.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Feb 24 2018, 4:40 AM
yuja accepted this revision.Feb 24 2018, 5:27 AM
This revision is now accepted and ready to land.Feb 24 2018, 5:27 AM
Closed by commit rHGdbf34d0ef9f6: py3: use pycompat.byteskwargs() to fix keyword arguments handling (authored by pulkit). · Explain WhyFeb 24 2018, 5:42 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/mq.py (2 lines)

Diff 6034

hgext/mq.py

def checkkeepchanges(self, keepchanges, force): def checkkeepchanges(self, keepchanges, force):
if force and keepchanges: if force and keepchanges:
raise error.Abort(_('cannot use both --force and --keep-changes')) raise error.Abort(_('cannot use both --force and --keep-changes'))
def new(self, repo, patchfn, *pats, **opts): def new(self, repo, patchfn, *pats, **opts):
"""options: """options:
msg: a string or a no-argument function returning a string msg: a string or a no-argument function returning a string
""" """
opts = pycompat.byteskwargs(opts)
msg = opts.get('msg') msg = opts.get('msg')
edit = opts.get('edit') edit = opts.get('edit')
editform = opts.get('editform', 'mq.qnew') editform = opts.get('editform', 'mq.qnew')
user = opts.get('user') user = opts.get('user')
date = opts.get('date') date = opts.get('date')
if date: if date:
date = util.parsedate(date) date = util.parsedate(date)
diffopts = self.diffopts({'git': opts.get('git')}, plain=True) diffopts = self.diffopts({'git': opts.get('git')}, plain=True)
if opts.get('reverse'): if opts.get('reverse'):
node1, node2 = None, qp node1, node2 = None, qp
else: else:
node1, node2 = qp, None node1, node2 = qp, None
diffopts = self.diffopts(opts, patch) diffopts = self.diffopts(opts, patch)
self.printdiff(repo, diffopts, node1, node2, files=pats, opts=opts) self.printdiff(repo, diffopts, node1, node2, files=pats, opts=opts)
def refresh(self, repo, pats=None, **opts): def refresh(self, repo, pats=None, **opts):
opts = pycompat.byteskwargs(opts)
if not self.applied: if not self.applied:
self.ui.write(_("no patches applied\n")) self.ui.write(_("no patches applied\n"))
return 1 return 1
msg = opts.get('msg', '').rstrip() msg = opts.get('msg', '').rstrip()
edit = opts.get('edit') edit = opts.get('edit')
editform = opts.get('editform', 'mq.qrefresh') editform = opts.get('editform', 'mq.qrefresh')
newuser = opts.get('user') newuser = opts.get('user')
newdate = opts.get('date') newdate = opts.get('date')