This is an archive of the discontinued Mercurial Phabricator instance.

	message,			message,
	files=files,			files=files,
	filectxfn=store,			filectxfn=store,
	user=user,			user=user,
	date=date,			date=date,
	branch=branch,			branch=branch,
	editor=editor,			editor=editor,
	)			)

				overrides = {}
				if opts.get(b'secret'):
				overrides[(b'phases', b'new-commit')] = b'secret'
				with repo.ui.configoverride(overrides, b'import'):
	n = memctx.commit()			n = memctx.commit()
	finally:			finally:
	store.close()			store.close()
	if opts.get(b'exact') and nocommit:			if opts.get(b'exact') and nocommit:
	# --exact with --no-commit is still useful in that it does merge			# --exact with --no-commit is still useful in that it does merge
	# and branch bits			# and branch bits
	ui.warn(_(b"warning: can't check exact import with --no-commit\n"))			ui.warn(_(b"warning: can't check exact import with --no-commit\n"))
	elif opts.get(b'exact') and (not n or hex(n) != nodeid):			elif opts.get(b'exact') and (not n or hex(n) != nodeid):
	raise error.Abort(_(b'patch is damaged or loses information'))			raise error.Abort(_(b'patch is damaged or loses information'))

tests/test-import.t

	diff -r 80971e65b431 -r 1d4bd90af0e4 a			diff -r 80971e65b431 -r 1d4bd90af0e4 a
	--- a/a			--- a/a
	+++ b/a			+++ b/a
	@@ -1,1 +1,2 @@			@@ -1,1 +1,2 @@
	line 1			line 1
	+line 2			+line 2
	$ hg --cwd b phase			$ hg --cwd b phase
	1: secret			1: secret
				$ hg --cwd b --config extensions.strip= strip 1 --no-backup --quiet
				$ hg --cwd b import --bypass --secret ../exported-tip.patch
				applying ../exported-tip.patch
				$ hg --cwd b phase -r tip
				1: secret
				$ hg --cwd b --config extensions.strip= strip 1 --no-backup --quiet
	$ rm -r b			$ rm -r b


	subject: duplicate detection, removal of [PATCH]			subject: duplicate detection, removal of [PATCH]
	The '---' tests the gitsendmail handling without proper mail headers			The '---' tests the gitsendmail handling without proper mail headers

	$ cat > mkmsg2.py <<EOF			$ cat > mkmsg2.py <<EOF
	> import email.message			> import email.message