This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4699

py3: use pycompat.strkwargs() in contrib/simplemerge
ClosedPublic

Authored by pulkit on Sep 23 2018, 9:09 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1dd82ecb869b: py3: use pycompat.strkwargs() in contrib/simplemerge
Summary

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.Sep 23 2018, 9:09 PM
Closed by commit rHG1dd82ecb869b: py3: use pycompat.strkwargs() in contrib/simplemerge (authored by pulkit). · Explain WhySep 24 2018, 1:50 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/simplemerge (3 lines)

Diff 11301

contrib/simplemerge

#!/usr/bin/env python #!/usr/bin/env python
from __future__ import absolute_import from __future__ import absolute_import
import getopt import getopt
import sys import sys
import hgdemandimport import hgdemandimport
hgdemandimport.enable() hgdemandimport.enable()
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
context, context,
error, error,
fancyopts, fancyopts,
pycompat,
simplemerge, simplemerge,
ui as uimod, ui as uimod,
) )
from mercurial.utils import ( from mercurial.utils import (
procutil, procutil,
) )
options = [(b'L', b'label', [], _(b'labels to use on conflict markers')), options = [(b'L', b'label', [], _(b'labels to use on conflict markers')),
sys.exit(0) sys.exit(0)
if len(args) != 3: if len(args) != 3:
raise ParseError(_(b'wrong number of arguments')) raise ParseError(_(b'wrong number of arguments'))
local, base, other = args local, base, other = args
sys.exit(simplemerge.simplemerge(uimod.ui.load(), sys.exit(simplemerge.simplemerge(uimod.ui.load(),
context.arbitraryfilectx(local), context.arbitraryfilectx(local),
context.arbitraryfilectx(base), context.arbitraryfilectx(base),
context.arbitraryfilectx(other), context.arbitraryfilectx(other),
**opts)) **pycompat.strkwargs(opts)))
except ParseError as e: except ParseError as e:
sys.stdout.write(b"%s: %s\n" % (sys.argv[0], e)) sys.stdout.write(b"%s: %s\n" % (sys.argv[0], e))
showhelp() showhelp()
sys.exit(1) sys.exit(1)
except error.Abort as e: except error.Abort as e:
sys.stderr.write(b"abort: %s\n" % e) sys.stderr.write(b"abort: %s\n" % e)
sys.exit(255) sys.exit(255)
except KeyboardInterrupt: except KeyboardInterrupt:
sys.exit(255) sys.exit(255)