This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D8837 mergeresult: make actionmapping a dict of dict instead of dict of lists
Closed	pulkit	D8836 largefiles: introduce a constant for 'lfmr' action
Closed	pulkit	D8835 largefiles: override merge.emptyactions() to include `lfmr`
Closed	pulkit	D8834 merge: unify logic of couple of if-else's in manifestmerge()
Closed	pulkit	D8833 sparse: add comment for an if condition which I tried to refactor
Closed	pulkit	D8832 mergeactions: use action constants instead of string values
Closed	pulkit	D8831 merge: use the new action based mapping introduced in mergeresult obj
Closed	pulkit	D8830 mergeresult: introduce action -> (filename, data, msg) mapping and related API
Closed	pulkit	D8829 mergeresult: rename _actions to _filemapping
Closed	pulkit	D8828 sparse: pass mergeresult obj in sparse.filterupdatesactions() (API)
Closed	pulkit	D8827 merge: filter actions before calling _resolvetrivial()
Closed	pulkit	D8826 merge: introduce mergeresult.updateactions() and use it
Closed	pulkit	D8825 merge: pass mergeresult instead of actions in _checkunknownfiles() (API)
Closed	pulkit	D8824 merge: pass mergeresult obj instead of actions dict in _resolvetrivial()
Closed	pulkit	D8823 merge: pass mergeresult obj instead of actions in _filternarrowactions()
Closed	pulkit	D8822 merge: pass mergeresult in checkpassconflicts() instead of actions (API)
Closed	pulkit	D8821 merge: add removefile() to mergeresult object
Closed	pulkit	D8820 merge: introduce mergeresult.addfile() and use it
Closed	pulkit	D8819 merge: make mergeresult constructor initialize empty object
Closed	pulkit	D8818 merge: improve documentation of fbid dict used for merge bid
Closed	pulkit	D8817 merge: move conversion of file-key dict to action-key dict in mergeresult
Closed	pulkit	D8816 merge: introduce hasconflicts() on mergeresult object
Closed	pulkit	D8744 merge: remove no longer required ACTION_GET_OTHER_AND_STORE
Closed	pulkit	D8743 merge: pass commitinfo to applyupdates() and get it stored in mergestate
Closed	pulkit	D8742 merge: introduce 'commitinfo' in mergeresult
Closed	pulkit	D8799 merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)

Diff 22119

hgext/remotefilelog/init.py

	dispatch,			dispatch,
	error,			error,
	exchange,			exchange,
	extensions,			extensions,
	hg,			hg,
	localrepo,			localrepo,
	match as matchmod,			match as matchmod,
	merge,			merge,
				mergestate as mergestatemod,
	node as nodemod,			node as nodemod,
	patch,			patch,
	pycompat,			pycompat,
	registrar,			registrar,
	repair,			repair,
	repoview,			repoview,
	revset,			revset,
	scmutil,			scmutil,

	# prefetch files before update			# prefetch files before update
	def applyupdates(			def applyupdates(
	orig, repo, actions, wctx, mctx, overwrite, wantfiledata, **opts			orig, repo, actions, wctx, mctx, overwrite, wantfiledata, **opts
	):			):
	if isenabled(repo):			if isenabled(repo):
	manifest = mctx.manifest()			manifest = mctx.manifest()
	files = []			files = []
	for f, args, msg in actions[b'g']:			for f, args, msg in actions[mergestatemod.ACTION_GET]:
	files.append((f, hex(manifest[f])))			files.append((f, hex(manifest[f])))
	# batch fetch the needed files from the server			# batch fetch the needed files from the server
	repo.fileservice.prefetch(files)			repo.fileservice.prefetch(files)
	return orig(repo, actions, wctx, mctx, overwrite, wantfiledata, **opts)			return orig(repo, actions, wctx, mctx, overwrite, wantfiledata, **opts)


	# Prefetch merge checkunknownfiles			# Prefetch merge checkunknownfiles
	def checkunknownfiles(orig, repo, wctx, mctx, force, mresult, args, *kwargs):			def checkunknownfiles(orig, repo, wctx, mctx, force, mresult, args, *kwargs):
	if isenabled(repo):			if isenabled(repo):
	files = []			files = []
	sparsematch = repo.maybesparsematch(mctx.rev())			sparsematch = repo.maybesparsematch(mctx.rev())
	for f, (m, actionargs, msg) in pycompat.iteritems(mresult.actions):			for f, (m, actionargs, msg) in pycompat.iteritems(mresult.actions):
	if sparsematch and not sparsematch(f):			if sparsematch and not sparsematch(f):
	continue			continue
	if m in (b'c', b'dc', b'cm'):			if m in (
				mergestatemod.ACTION_CREATED,
				mergestatemod.ACTION_DELETED_CHANGED,
				mergestatemod.ACTION_CREATED_MERGE,
				):
	files.append((f, hex(mctx.filenode(f))))			files.append((f, hex(mctx.filenode(f))))
	elif m == b'dg':			elif m == mergestatemod.ACTION_LOCAL_DIR_RENAME_GET:
	f2 = actionargs[0]			f2 = actionargs[0]
	files.append((f2, hex(mctx.filenode(f2))))			files.append((f2, hex(mctx.filenode(f2))))
	# batch fetch the needed files from the server			# batch fetch the needed files from the server
	repo.fileservice.prefetch(files)			repo.fileservice.prefetch(files)
	return orig(repo, wctx, mctx, force, mresult, args, *kwargs)			return orig(repo, wctx, mctx, force, mresult, args, *kwargs)


	# Prefetch files before status attempts to look at their size and contents			# Prefetch files before status attempts to look at their size and contents

mercurial/sparse.py

	sparsematch = matcher(repo, [mctx.rev()])			sparsematch = matcher(repo, [mctx.rev()])

	temporaryfiles = []			temporaryfiles = []
	for file, action in pycompat.iteritems(mresult.actions):			for file, action in pycompat.iteritems(mresult.actions):
	type, args, msg = action			type, args, msg = action
	files.add(file)			files.add(file)
	if sparsematch(file):			if sparsematch(file):
	prunedactions[file] = action			prunedactions[file] = action
	elif type == b'm':			elif type == mergestatemod.ACTION_MERGE:
	temporaryfiles.append(file)			temporaryfiles.append(file)
	prunedactions[file] = action			prunedactions[file] = action
	elif branchmerge:			elif branchmerge:
	if type != b'k':			if type != mergestatemod.ACTION_KEEP:
	temporaryfiles.append(file)			temporaryfiles.append(file)
	prunedactions[file] = action			prunedactions[file] = action
	elif type == b'f':			elif type == mergestatemod.ACTION_FORGET:
	prunedactions[file] = action			prunedactions[file] = action
	elif file in wctx:			elif file in wctx:
	prunedactions[file] = (b'r', args, msg)			prunedactions[file] = (mergestatemod.ACTION_REMOVE, args, msg)

	if branchmerge and type == mergestatemod.ACTION_MERGE:			if branchmerge and type == mergestatemod.ACTION_MERGE:
	f1, f2, fa, move, anc = args			f1, f2, fa, move, anc = args
	if not sparsematch(f1):			if not sparsematch(f1):
	temporaryfiles.append(f1)			temporaryfiles.append(f1)

	if len(temporaryfiles) > 0:			if len(temporaryfiles) > 0:
	repo.ui.status(			repo.ui.status(
	message = b'temporarily adding to sparse checkout'			message = b'temporarily adding to sparse checkout'
	wctxmanifest = repo[None].manifest()			wctxmanifest = repo[None].manifest()
	for file in temporaryfiles:			for file in temporaryfiles:
	if file in wctxmanifest:			if file in wctxmanifest:
	fctx = repo[None][file]			fctx = repo[None][file]
	actions.append((file, (fctx.flags(), False), message))			actions.append((file, (fctx.flags(), False), message))

	typeactions = mergemod.emptyactions()			typeactions = mergemod.emptyactions()
	typeactions[b'g'] = actions			typeactions[mergestatemod.ACTION_GET] = actions
	mergemod.applyupdates(			mergemod.applyupdates(
	repo, typeactions, repo[None], repo[b'.'], False, wantfiledata=False			repo, typeactions, repo[None], repo[b'.'], False, wantfiledata=False
	)			)

	dirstate = repo.dirstate			dirstate = repo.dirstate
	for file, flags, msg in actions:			for file, flags, msg in actions:
	dirstate.normal(file)			dirstate.normal(file)

	profiles = activeconfig(repo)[2]			profiles = activeconfig(repo)[2]
	changedprofiles = profiles & files			changedprofiles = profiles & files
	# If an active profile changed during the update, refresh the checkout.			# If an active profile changed during the update, refresh the checkout.
	# Don't do this during a branch merge, since all incoming changes should			# Don't do this during a branch merge, since all incoming changes should
	# have been handled by the temporary includes above.			# have been handled by the temporary includes above.
	if changedprofiles and not branchmerge:			if changedprofiles and not branchmerge:
	mf = mctx.manifest()			mf = mctx.manifest()
	for file in mf:			for file in mf:
	old = oldsparsematch(file)			old = oldsparsematch(file)
	new = sparsematch(file)			new = sparsematch(file)
	if not old and new:			if not old and new:
	flags = mf.flags(file)			flags = mf.flags(file)
	prunedactions[file] = (b'g', (flags, False), b'')			prunedactions[file] = (
				mergestatemod.ACTION_GET,
				(flags, False),
				b'',
				)
	elif old and not new:			elif old and not new:
	prunedactions[file] = (b'r', [], b'')			prunedactions[file] = (mergestatemod.ACTION_REMOVE, [], b'')

	mresult.setactions(prunedactions)			mresult.setactions(prunedactions)


	def refreshwdir(repo, origstatus, origsparsematch, force=False):			def refreshwdir(repo, origstatus, origsparsematch, force=False):
	"""Refreshes working directory by taking sparse config into account.			"""Refreshes working directory by taking sparse config into account.

	The old status and sparse matcher is compared against the current sparse			The old status and sparse matcher is compared against the current sparse

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22119		Jul 25 2020, 6:02 AM	★	★
Diff 2	22215	rHG30f3e278c5d791f8ae11f95d8a6373b098550b94	Jul 24 2020, 2:10 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

mergeactions: use action constants instead of string valuesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 22119

hgext/remotefilelog/__init__.py

mercurial/sparse.py

mergeactions: use action constants instead of string values
ClosedPublic

Revision Contents
Changeset List

hgext/remotefilelog/init.py