This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D11612 largefiles: partially undo 61e526585b20e2ff15f19497d0451d18fea02db8 and child
Closed	pulkit	D11611 largefiles: add tr backup for largefilesdirstate
Closed	pulkit	D11610 largefiles: pass current transaction to `lfdirstate.write()`

Diff 30672

	repo.wwrite(f, fctx.data(), fctx.flags())			repo.wwrite(f, fctx.data(), fctx.flags())
	else:			else:
	# content of standin is not so important in 'a',			# content of standin is not so important in 'a',
	# 'm' or 'n' (coming from the 2nd parent) cases			# 'm' or 'n' (coming from the 2nd parent) cases
	lfutil.writestandin(repo, f, b'', False)			lfutil.writestandin(repo, f, b'', False)
	for standin in orphans:			for standin in orphans:
	repo.wvfs.unlinkpath(standin, ignoremissing=True)			repo.wvfs.unlinkpath(standin, ignoremissing=True)

	lfdirstate = lfutil.openlfdirstate(ui, repo)
	with lfdirstate.parentchange():
	orphans = set(lfdirstate)
	lfiles = lfutil.listlfiles(repo)
	for file in lfiles:
	lfutil.synclfdirstate(repo, lfdirstate, file, True)
	orphans.discard(file)
	for lfile in orphans:
	lfdirstate.update_file(
	lfile, p1_tracked=False, wc_tracked=False
	)
	lfdirstate.write()
	return result			return result


	@eh.wrapcommand(b'transplant', extension=b'transplant')			@eh.wrapcommand(b'transplant', extension=b'transplant')
	def overridetransplant(orig, ui, repo, revs, *opts):			def overridetransplant(orig, ui, repo, revs, *opts):
	resuming = opts.get('continue')			resuming = opts.get('continue')
	repo._lfcommithooks.append(lfutil.automatedcommithook(resuming))			repo._lfcommithooks.append(lfutil.automatedcommithook(resuming))
	repo._lfstatuswriters.append(lambda msg, *opts: None)			repo._lfstatuswriters.append(lambda msg, *opts: None)