This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D10886 narrowbundle: use new context manager for silencing the ui
Closed	martinvonz	D10885 debugbackupbundle: use new context manager for silencing the ui
Closed	martinvonz	D10884 ui: add a context manager for silencing the ui (pushbuffer+popbuffer)
Closed	martinvonz	D10883 shelve: don't swallow errors that happen when reverting the working copy
Closed	martinvonz	D10882 histedit: don't swallow errors that happen when updating the working copy
Closed	martinvonz	D10881 histedit: don't record labels for output that we will discard
Closed	martinvonz	D10864 dog-raft: work with str-keyed opts throughout
Closed	martinvonz	D10863 cmdutil: make resolvecommitoptions() work on str-keyed opts
Closed	martinvonz	D10862 cmdutil: make amend() take str-keyed opts
Closed	martinvonz	D10861 commit: keep opts dict str-keyed a bit longer
Closed	martinvonz	D10860 dog-raft: keep opts dict str-keyed a bit longer
Closed	martinvonz	D10859 cmdutil: make checknotesize() work on str-keyed opts
Closed	martinvonz	D10880 amend: work mostly with str-type **opts for simplicity

Diff 28601

	def amend(ui, repo, pats, *opts):			def amend(ui, repo, pats, *opts):
	"""amend the working copy parent with all or specified outstanding changes			"""amend the working copy parent with all or specified outstanding changes

	Similar to :hg:`commit --amend`, but reuse the commit message without			Similar to :hg:`commit --amend`, but reuse the commit message without
	invoking editor, unless ``--edit`` was set.			invoking editor, unless ``--edit`` was set.

	See :hg:`help commit` for more details.			See :hg:`help commit` for more details.
	"""			"""
	opts = pycompat.byteskwargs(opts)			cmdutil.checknotesize(ui, pycompat.byteskwargs(opts))
	cmdutil.checknotesize(ui, opts)

	with repo.wlock(), repo.lock():			with repo.wlock(), repo.lock():
	if not opts.get(b'logfile'):			if not opts.get('logfile'):
	opts[b'message'] = opts.get(b'message') or repo[b'.'].description()			opts['message'] = opts.get('message') or repo[b'.'].description()
	opts[b'amend'] = True			opts['amend'] = True
	return commands._docommit(ui, repo, pats, *pycompat.strkwargs(opts))			return commands._docommit(ui, repo, pats, *opts)