( )⚙ D2861 uncommit: fix unaligned indentation

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2861

uncommit: fix unaligned indentation
ClosedPublic

Authored by martinvonz on Mar 14 2018, 2:21 PM.

Download Raw Diff

Tags

None

Subscribers

mercurial-devel

Details

Reviewers

Group Reviewers

Commits

rHG3d0178bf1039: uncommit: fix unaligned indentation
rHGbc50adf75a50: uncommit: fix unaligned indentation
rHG51c63f04b55e: uncommit: fix unaligned indentation

Diff Detail

Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 14 2018, 2:21 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 14 2018, 2:21 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

martinvonz added a child revision: D2862: uncommit: leave empty commit if all files are uncommitted.Mar 14 2018, 2:21 PM

pulkit accepted this revision.Mar 14 2018, 2:33 PM

Closed by commit rHG51c63f04b55e: uncommit: fix unaligned indentation (authored by martinvonz). · Explain WhyMar 14 2018, 2:37 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/uncommit.py (2 lines)

Diff 7040

hgext/uncommit.py

	deleted in the changeset will be left unchanged, and so will remain			deleted in the changeset will be left unchanged, and so will remain
	modified in the working directory.			modified in the working directory.
	"""			"""
	opts = pycompat.byteskwargs(opts)			opts = pycompat.byteskwargs(opts)

	with repo.wlock(), repo.lock():			with repo.wlock(), repo.lock():

	if not pats and not repo.ui.configbool('experimental',			if not pats and not repo.ui.configbool('experimental',
	'uncommitondirtywdir'):			'uncommitondirtywdir'):
	cmdutil.bailifchanged(repo)			cmdutil.bailifchanged(repo)
	old = repo['.']			old = repo['.']
	rewriteutil.precheck(repo, [old.rev()], 'uncommit')			rewriteutil.precheck(repo, [old.rev()], 'uncommit')
	if len(old.parents()) > 1:			if len(old.parents()) > 1:
	raise error.Abort(_("cannot uncommit merge changeset"))			raise error.Abort(_("cannot uncommit merge changeset"))

	with repo.transaction('uncommit'):			with repo.transaction('uncommit'):
	match = scmutil.match(old, pats, opts)			match = scmutil.match(old, pats, opts)