This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	marmoute	D12119 narrow: allow merging non-conflicting change outside of the narrow spec
Closed	marmoute	D12118 merge-actions: add some information about the "changes" the action do
Closed	marmoute	D12117 merge-actions: have an attribute for narrow safetiness
Closed	marmoute	D12116 merge-actions: add an explicite "no_op" attribute
Closed	marmoute	D12115 merge-actions: gather all created action into a set
Closed	marmoute	D12114 merge-actions: make merge action a full featured object
Closed	marmoute	D12113 convert: use the merge action constant
Closed	marmoute	D12112 large-file: use the merge action constant
Closed	marmoute	D12111 merge: stop using merge action for pathconflict option
Closed	marmoute	D12110 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12109 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12108 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12107 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12106 merge: break up two not-so-one-liner for extra readability
Closed	marmoute	D12105 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12104 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12103 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12102 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12101 merge: break up a not-so-one-liner for readability

Diff 32008

hgext/largefiles/overrides.py

	)			)

	from . import (			from . import (
	lfcommands,			lfcommands,
	lfutil,			lfutil,
	storefactory,			storefactory,
	)			)

				ACTION_ADD = mergestatemod.ACTION_ADD
				ACTION_DELETED_CHANGED = mergestatemod.ACTION_DELETED_CHANGED
				ACTION_GET = mergestatemod.ACTION_GET
				ACTION_KEEP = mergestatemod.ACTION_KEEP
				ACTION_REMOVE = mergestatemod.ACTION_REMOVE

	eh = exthelper.exthelper()			eh = exthelper.exthelper()

	lfstatus = lfutil.lfstatus			lfstatus = lfutil.lfstatus

	MERGE_ACTION_LARGEFILE_MARK_REMOVED = b'lfmr'			MERGE_ACTION_LARGEFILE_MARK_REMOVED = b'lfmr'

	# -- Utility functions: commonly/repeatedly needed functionality ---------------			# -- Utility functions: commonly/repeatedly needed functionality ---------------

	lfiles.add(splitstandin)			lfiles.add(splitstandin)
	elif lfutil.standin(f) in p1:			elif lfutil.standin(f) in p1:
	lfiles.add(f)			lfiles.add(f)

	for lfile in sorted(lfiles):			for lfile in sorted(lfiles):
	standin = lfutil.standin(lfile)			standin = lfutil.standin(lfile)
	(lm, largs, lmsg) = mresult.getfile(lfile, (None, None, None))			(lm, largs, lmsg) = mresult.getfile(lfile, (None, None, None))
	(sm, sargs, smsg) = mresult.getfile(standin, (None, None, None))			(sm, sargs, smsg) = mresult.getfile(standin, (None, None, None))
	if sm in (b'g', b'dc') and lm != b'r':
	if sm == b'dc':			if sm in (ACTION_GET, ACTION_DELETED_CHANGED) and lm != ACTION_REMOVE:
				if sm == ACTION_DELETED_CHANGED:
	f1, f2, fa, move, anc = sargs			f1, f2, fa, move, anc = sargs
	sargs = (p2[f2].flags(), False)			sargs = (p2[f2].flags(), False)
	# Case 1: normal file in the working copy, largefile in			# Case 1: normal file in the working copy, largefile in
	# the second parent			# the second parent
	usermsg = (			usermsg = (
	_(			_(
	b'remote turned local normal file %s into a largefile\n'			b'remote turned local normal file %s into a largefile\n'
	b'use (l)argefile or keep (n)ormal file?'			b'use (l)argefile or keep (n)ormal file?'
	b'$$ &Largefile $$ &Normal file'			b'$$ &Largefile $$ &Normal file'
	)			)
	% lfile			% lfile
	)			)
	if repo.ui.promptchoice(usermsg, 0) == 0: # pick remote largefile			if repo.ui.promptchoice(usermsg, 0) == 0: # pick remote largefile
	mresult.addfile(lfile, b'r', None, b'replaced by standin')			mresult.addfile(
	mresult.addfile(standin, b'g', sargs, b'replaces standin')			lfile, ACTION_REMOVE, None, b'replaced by standin'
				)
				mresult.addfile(standin, ACTION_GET, sargs, b'replaces standin')
	else: # keep local normal file			else: # keep local normal file
	mresult.addfile(lfile, b'k', None, b'replaces standin')			mresult.addfile(lfile, ACTION_KEEP, None, b'replaces standin')
	if branchmerge:			if branchmerge:
	mresult.addfile(			mresult.addfile(
	standin,			standin,
	b'k',			ACTION_KEEP,
	None,			None,
	b'replaced by non-standin',			b'replaced by non-standin',
	)			)
	else:			else:
	mresult.addfile(			mresult.addfile(
	standin,			standin,
	b'r',			ACTION_REMOVE,
	None,			None,
	b'replaced by non-standin',			b'replaced by non-standin',
	)			)
	elif lm in (b'g', b'dc') and sm != b'r':			if lm in (ACTION_GET, ACTION_DELETED_CHANGED) and sm != ACTION_REMOVE:
	if lm == b'dc':			if lm == ACTION_DELETED_CHANGED:
	f1, f2, fa, move, anc = largs			f1, f2, fa, move, anc = largs
	largs = (p2[f2].flags(), False)			largs = (p2[f2].flags(), False)
	# Case 2: largefile in the working copy, normal file in			# Case 2: largefile in the working copy, normal file in
	# the second parent			# the second parent
	usermsg = (			usermsg = (
	_(			_(
	b'remote turned local largefile %s into a normal file\n'			b'remote turned local largefile %s into a normal file\n'
	b'keep (l)argefile or use (n)ormal file?'			b'keep (l)argefile or use (n)ormal file?'
	b'$$ &Largefile $$ &Normal file'			b'$$ &Largefile $$ &Normal file'
	)			)
	% lfile			% lfile
	)			)
	if repo.ui.promptchoice(usermsg, 0) == 0: # keep local largefile			if repo.ui.promptchoice(usermsg, 0) == 0: # keep local largefile
	if branchmerge:			if branchmerge:
	# largefile can be restored from standin safely			# largefile can be restored from standin safely
	mresult.addfile(			mresult.addfile(
	lfile,			lfile,
	b'k',			ACTION_KEEP,
	None,			None,
	b'replaced by standin',			b'replaced by standin',
	)			)
	mresult.addfile(standin, b'k', None, b'replaces standin')			mresult.addfile(
				standin, ACTION_KEEP, None, b'replaces standin'
				)
	else:			else:
	# "lfile" should be marked as "removed" without			# "lfile" should be marked as "removed" without
	# removal of itself			# removal of itself
	mresult.addfile(			mresult.addfile(
	lfile,			lfile,
	MERGE_ACTION_LARGEFILE_MARK_REMOVED,			MERGE_ACTION_LARGEFILE_MARK_REMOVED,
	None,			None,
	b'forget non-standin largefile',			b'forget non-standin largefile',
	)			)

	# linear-merge should treat this largefile as 're-added'			# linear-merge should treat this largefile as 're-added'
	mresult.addfile(standin, b'a', None, b'keep standin')			mresult.addfile(standin, ACTION_ADD, None, b'keep standin')
	else: # pick remote normal file			else: # pick remote normal file
	mresult.addfile(lfile, b'g', largs, b'replaces standin')			mresult.addfile(lfile, ACTION_GET, largs, b'replaces standin')
	mresult.addfile(			mresult.addfile(
	standin,			standin,
	b'r',			ACTION_REMOVE,
	None,			None,
	b'replaced by non-standin',			b'replaced by non-standin',
	)			)

	return mresult			return mresult


	@eh.wrapfunction(mergestatemod, b'recordupdates')			@eh.wrapfunction(mergestatemod, b'recordupdates')

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	32008		Jan 29 2022, 9:13 AM	★	★
Diff 2	32070	rHGd536d4afe003734a568105889fd5efcaa0b0f53f	Jan 28 2022, 10:11 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

large-file: use the merge action constantClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 32008

hgext/largefiles/overrides.py

large-file: use the merge action constant
ClosedPublic

Revision Contents
Changeset List