mercurial/commands.py
changeset 47431 fca9c63f160e
parent 47430 3ee036c6f834
child 47432 7f7457f84311
equal deleted inserted replaced
47430:3ee036c6f834 47431:fca9c63f160e
  2133         # Note: eventually this guard will be removed. Please do not expect
  2133         # Note: eventually this guard will be removed. Please do not expect
  2134         # this behavior to remain.
  2134         # this behavior to remain.
  2135         if not obsolete.isenabled(repo, obsolete.createmarkersopt):
  2135         if not obsolete.isenabled(repo, obsolete.createmarkersopt):
  2136             cmdutil.checkunfinished(repo)
  2136             cmdutil.checkunfinished(repo)
  2137 
  2137 
       
  2138         node = cmdutil.amend(ui, repo, old, extra, pats, opts)
  2138         opts = pycompat.byteskwargs(opts)
  2139         opts = pycompat.byteskwargs(opts)
  2139         node = cmdutil.amend(ui, repo, old, extra, pats, opts)
       
  2140         if node == old.node():
  2140         if node == old.node():
  2141             ui.status(_(b"nothing changed\n"))
  2141             ui.status(_(b"nothing changed\n"))
  2142             return 1
  2142             return 1
  2143     else:
  2143     else:
  2144 
  2144