mercurial/cmdutil.py
changeset 47431 fca9c63f160e
parent 47428 54849b65dc5f
child 47432 7f7457f84311
equal deleted inserted replaced
47430:3ee036c6f834 47431: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.