This is an archive of the discontinued Mercurial Phabricator instance.

	fm.context(ctx=ctx)			fm.context(ctx=ctx)
	fm.data(linetype='changeset')			fm.data(linetype='changeset')
	fm.write('node', '%-7.7s ', ctx.hex(), label='absorb.node')			fm.write('node', '%-7.7s ', ctx.hex(), label='absorb.node')
	descfirstline = ctx.description().splitlines()[0]			descfirstline = ctx.description().splitlines()[0]
	fm.write('descfirstline', '%s\n', descfirstline,			fm.write('descfirstline', '%s\n', descfirstline,
	label='absorb.description')			label='absorb.description')
	fm.end()			fm.end()
	if not opts.get('dry_run'):			if not opts.get('dry_run'):
	if not opts.get('apply_changes'):			if (not opts.get('apply_changes') and
	if ui.promptchoice("apply changes (yn)? $$ &Yes $$ &No", default=1):			state.ctxaffected and
				ui.promptchoice("apply changes (yn)? $$ &Yes $$ &No", default=1)):
	raise error.Abort(_('absorb cancelled\n'))			raise error.Abort(_('absorb cancelled\n'))

	state.apply()			state.apply()
	if state.commit():			if state.commit():
	state.printchunkstats()			state.printchunkstats()
	elif not ui.quiet:			elif not ui.quiet:
	ui.write(_('nothing applied\n'))			ui.write(_('nothing applied\n'))
	return state			return state

tests/test-absorb.t


	Non 1:1 map changes will be ignored:			Non 1:1 map changes will be ignored:

	$ echo 1 > a			$ echo 1 > a
	$ hg absorb --apply-changes			$ hg absorb --apply-changes
	nothing applied			nothing applied
	[1]			[1]

				The prompt is not given if there are no changes to be applied, even if there
				are some changes that won't be applied:

				$ hg absorb
				showing changes for a
				@@ -0,2 +0,1 @@
				-2b
				-4d
				+1

				0 changesets affected
				nothing applied
				[1]

	Insertaions:			Insertaions:

	$ cat > a << EOF			$ cat > a << EOF
	> insert before 2b			> insert before 2b
	> 2b			> 2b
	> 4d			> 4d
	> insert aftert 4d			> insert aftert 4d
	> EOF			> EOF