This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	phillco	D604 context: add arbitraryfilectx, which can represent files outside the workdir
Closed	phillco	D603 simplemerge: remove unused `filtereddata` parameter
Closed	phillco	D602 simplemerge: remove unused `repo` parameter

Diff 1558

	sys.exit(0)			sys.exit(0)
	if len(args) != 3:			if len(args) != 3:
	raise ParseError(_('wrong number of arguments'))			raise ParseError(_('wrong number of arguments'))
	local, base, other = args			local, base, other = args
	sys.exit(simplemerge.simplemerge(uimod.ui.load(),			sys.exit(simplemerge.simplemerge(uimod.ui.load(),
	filebackedctx(local),			filebackedctx(local),
	filebackedctx(base),			filebackedctx(base),
	filebackedctx(other),			filebackedctx(other),
	filtereddata=True,
	**opts))			**opts))
	except ParseError as e:			except ParseError as e:
	sys.stdout.write("%s: %s\n" % (sys.argv[0], e))			sys.stdout.write("%s: %s\n" % (sys.argv[0], e))
	showhelp()			showhelp()
	sys.exit(1)			sys.exit(1)
	except error.Abort as e:			except error.Abort as e:
	sys.stderr.write("abort: %s\n" % e)			sys.stderr.write("abort: %s\n" % e)
	sys.exit(255)			sys.exit(255)
	except KeyboardInterrupt:			except KeyboardInterrupt:
	sys.exit(255)			sys.exit(255)