( )⚙ D1301 py3: handle keyword arguments in hgext/extdiff.py

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1301

py3: handle keyword arguments in hgext/extdiff.py
ClosedPublic

Authored by pulkit on Nov 2 2017, 5:14 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGa8bc191fee5a: py3: handle keyword arguments in hgext/extdiff.py
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Nov 2 2017, 5:14 PM
yuja accepted this revision.Nov 4 2017, 3:37 AM
This revision is now accepted and ready to land.Nov 4 2017, 3:37 AM
Closed by commit rHGa8bc191fee5a: py3: handle keyword arguments in hgext/extdiff.py (authored by pulkit). · Explain WhyNov 4 2017, 3:52 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/extdiff.py (2 lines)

Diff 3238

hgext/extdiff.py

pass additional options to the program, use -o/--option. These pass additional options to the program, use -o/--option. These
will be passed before the names of the directories to compare. will be passed before the names of the directories to compare.
When two revision arguments are given, then changes are shown When two revision arguments are given, then changes are shown
between those revisions. If only one revision is specified then between those revisions. If only one revision is specified then
that revision is compared to the working directory, and, when no that revision is compared to the working directory, and, when no
revisions are specified, the working directory files are compared revisions are specified, the working directory files are compared
to its parent.''' to its parent.'''
opts = pycompat.byteskwargs(opts)
program = opts.get('program') program = opts.get('program')
option = opts.get('option') option = opts.get('option')
if not program: if not program:
program = 'diff' program = 'diff'
option = option or ['-Npru'] option = option or ['-Npru']
cmdline = ' '.join(map(util.shellquote, [program] + option)) cmdline = ' '.join(map(util.shellquote, [program] + option))
return dodiff(ui, repo, cmdline, pats, opts) return dodiff(ui, repo, cmdline, pats, opts)
def __init__(self, path, cmdline): def __init__(self, path, cmdline):
# We can't pass non-ASCII through docstrings (and path is # We can't pass non-ASCII through docstrings (and path is
# in an unknown encoding anyway) # in an unknown encoding anyway)
docpath = util.escapestr(path) docpath = util.escapestr(path)
self.__doc__ = self.__doc__ % {'path': util.uirepr(docpath)} self.__doc__ = self.__doc__ % {'path': util.uirepr(docpath)}
self._cmdline = cmdline self._cmdline = cmdline
def __call__(self, ui, repo, *pats, **opts): def __call__(self, ui, repo, *pats, **opts):
opts = pycompat.byteskwargs(opts)
options = ' '.join(map(util.shellquote, opts['option'])) options = ' '.join(map(util.shellquote, opts['option']))
if options: if options:
options = ' ' + options options = ' ' + options
return dodiff(ui, repo, self._cmdline + options, pats, opts) return dodiff(ui, repo, self._cmdline + options, pats, opts)
def uisetup(ui): def uisetup(ui):
for cmd, path in ui.configitems('extdiff'): for cmd, path in ui.configitems('extdiff'):
path = util.expandpath(path) path = util.expandpath(path)