Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 47437:fca9c63f160e
cmdutil: make amend() take str-keyed opts
I couldn't think of a reasonable change to the signature here, so
unfortunately it keeps the existing one.
Differential Revision: https://phab.mercurial-scm.org/D10862
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 10 Jun 2021 14:55:10 -0700 |
parents | 54849b65dc5f |
children | 7f7457f84311 |
comparison
equal
deleted
inserted
replaced
47436:3ee036c6f834 | 47437:fca9c63f160e |
---|---|
2781 else: | 2781 else: |
2782 return f not in ctx2.manifest() | 2782 return f not in ctx2.manifest() |
2783 | 2783 |
2784 | 2784 |
2785 def amend(ui, repo, old, extra, pats, opts): | 2785 def amend(ui, repo, old, extra, pats, opts): |
2786 opts = pycompat.byteskwargs(opts) | |
2786 # avoid cycle context -> subrepo -> cmdutil | 2787 # avoid cycle context -> subrepo -> cmdutil |
2787 from . import context | 2788 from . import context |
2788 | 2789 |
2789 # amend will reuse the existing user if not specified, but the obsolete | 2790 # amend will reuse the existing user if not specified, but the obsolete |
2790 # marker creation requires that the current user's name is specified. | 2791 # marker creation requires that the current user's name is specified. |