This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	860		Aug 14 2017, 2:15 AM	★	★
Diff 2	1039		Aug 17 2017, 2:40 PM	★	★
Diff 3	1286	rHG1915a5e809ca8a2b938e82765ce0dec1bba64cff	Aug 25 2017, 12:30 AM	★	★

Status	Author	Revision
Closed	phillco	D383 simplemerge: simplify code now that we always write to a context
Closed	phillco	D382 simplemerge: make context parameters non-optional
Closed	phillco	D381 simplemerge: stop accepting, and passing, file parameters
Closed	phillco	D380 simplemerge: stop reading from, and writing to, files
Closed	phillco	D379 simplemerge: use context paths for default labels instead of file paths
Closed	phillco	D378 contrib: make simplemerge script pass context-like objects
Closed	phillco	D435 simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata`
Closed	phillco	D434 context: add `decodeddata()` to basefilectx
Closed	phillco	D376 filemerge: extract `_picklabels` as a helper function
Closed	phillco	D375 simplemerge: write merge result to the localctx, if passed
Closed	phillco	D374 simplemerge: use contexts to read file data from, if passed
Closed	phillco	D373 filemerge: pass contexts to simplemerge
Closed	phillco	D372 simplemerge: add optional context parameters to simplemerge
Closed	phillco	D371 simplemerge: extract verifytext as a helper function

Diff 1286

	self.text += text			self.text += text

	def close(self):			def close(self):
	self.ctx.write(self.text, self.ctx.flags())			self.ctx.write(self.text, self.ctx.flags())

	mode = opts.get('mode','merge')			mode = opts.get('mode','merge')
	name_a, name_b, name_base = None, None, None			name_a, name_b, name_base = None, None, None
	if mode != 'union':			if mode != 'union':
	name_a, name_b, name_base = _picklabels([localfile,			name_a, name_b, name_base = _picklabels([localctx.path(),
	otherfile, None],			otherctx.path(), None],
	opts.get('label', []))			opts.get('label', []))

	try:			try:
	localtext = readctx(localctx) if localctx else readfile(localfile)			localtext = readctx(localctx) if localctx else readfile(localfile)
	basetext = readctx(basectx) if basectx else readfile(basefile)			basetext = readctx(basectx) if basectx else readfile(basefile)
	othertext = readctx(otherctx) if otherctx else readfile(otherfile)			othertext = readctx(otherctx) if otherctx else readfile(otherfile)
	except error.Abort:			except error.Abort:
	return 1			return 1