merge: don't check for unknown files in IMM
ClosedPublic

This and one other one are marked accepted by me, but the rebase was trickier than I have time for right now. Could you rebase them and reupload? Thanks!

phillco updated this revision to Diff 4176.Dec 7 2017, 4:22 PM

Closed by commit rHG5db3c748ce8f: merge: don't check for unknown files in IMM (authored by phillco). · Explain WhyDec 7 2017, 5:14 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/merge.py (15 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	3063		Oct 23 2017, 3:44 PM	★	★
Diff 2	3554		Nov 16 2017, 1:00 AM	★	★
Diff 3	3559		Nov 16 2017, 1:03 AM	★	★
Diff 4	4176		Dec 7 2017, 4:22 PM	★	★
Diff 5	4218	rHG5db3c748ce8f67ca256832d07f0f9fc0116f4bb4	Dec 7 2017, 4:20 PM	★	★

Status	Author	Revision
Closed	phillco	D1617 rebase: extract _assignworkingcopy
Closed	phillco	D1616 rebase: disable `inmemory` if the rebaseset contains the working copy
Closed	phillco	D1249 rebase: rerun a rebase on-disk if IMM merge conflicts arise
Closed	phillco	D1248 rebase: add concludememorynode(), and call it when rebasing in-memory
Closed	phillco	D1247 rebase: pass the wctx object (IMM or on-disk) to merge.update
Closed	phillco	D1246 rebase: do not update if IMM; instead, set the overlaywctx's parents
Closed	phillco	D1245 rebase: pass wctx to rebasenode()
Closed	phillco	D1244 overlayworkingctx: invalidate the manifest cache when changing parents
Closed	phillco	D1243 overlayworkingctx: add `_compact()`
Closed	phillco	D1242 overlayworkingctx: add ``tomemctx()`` and ``commit()``
Closed	phillco	D1241 overlayworkingctx: add _auditconflicts to write()
Closed	phillco	D1240 overlayworkingctx: inherit from committablectx instead of workingctx
Closed	phillco	D1239 overlayworkingctx: add a no-op ``clearunknown()``
Closed	phillco	D1238 overlayworkingctx: add _manifest, files(), added(), removed(), modified()
Closed	phillco	D1237 overlayworkingctx: add `_checkexist(path)`
Closed	phillco	D1236 overlayworkingctx: fix a bad reference to `self._path`
Closed	phillco	D1235 overlayworkingctx: track copy information in the context
Closed	phillco	D1234 rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
Closed	phillco	D1233 rebase: do not bail on uncomitted changes if rebasing in-memory
Closed	phillco	D1232 rebase: add the --inmemory option flag; assign a wctx object for the rebase
Closed	phillco	D1231 overlayworkingctx: move _wrappedctx out of the constructor
Closed	phillco	D1230 overlayworkingctx: make clean() public
Closed	phillco	D1216 overlayworkingctx: remove flushall()
Closed	phillco	D1215 merge: skip subrepo state, update hooks, and updating the dirstate in IMM
Closed	phillco	D1214 merge: don't check for unknown files in IMM
Closed	phillco	D1213 merge: remove calls to flushall()
Closed	phillco	D1212 filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM
Closed	phillco	D1211 context: switch ctx() use to changectx()
Abandoned	phillco	D1527 context: add an abstract base class for filectx

Diff 3559

mercurial/merge.py

	if config not in valid:			if config not in valid:
	validstr = ', '.join(["'" + v + "'" for v in valid])			validstr = ', '.join(["'" + v + "'" for v in valid])
	raise error.ConfigError(_("%s.%s not valid "			raise error.ConfigError(_("%s.%s not valid "
	"('%s' is none of %s)")			"('%s' is none of %s)")
	% (section, name, config, validstr))			% (section, name, config, validstr))
	return config			return config

	def _checkunknownfile(repo, wctx, mctx, f, f2=None):			def _checkunknownfile(repo, wctx, mctx, f, f2=None):
				if wctx.isinmemory():
				# Nothing to do in IMM because nothing in the "working copy" can be an
				# unknown file.
				#
				# Note that we should bail out here, not in ``_checkunknownfiles()``,
				# because that function does other useful work.
				return False

	if f2 is None:			if f2 is None:
	f2 = f			f2 = f
	return (repo.wvfs.audit.check(f)			return (repo.wvfs.audit.check(f)
	and repo.wvfs.isfileorlink(f)			and repo.wvfs.isfileorlink(f)
	and repo.dirstate.normalize(f) not in repo.dirstate			and repo.dirstate.normalize(f) not in repo.dirstate
	and mctx[f2].cmp(wctx[f]))			and mctx[f2].cmp(wctx[f]))

	def _checkunknowndirs(repo, f):			def _checkunknowndirs(repo, wctx, f):
				martinvonzUnsubmitted Done Should this also short-circuit? martinvonz: Should this also short-circuit?
				phillcoAuthorUnsubmitted Not Done Good catch, thanks. phillco: Good catch, thanks.
	"""			"""
	Look for any unknown files or directories that may have a path conflict			Look for any unknown files or directories that may have a path conflict
	with a file. If any path prefix of the file exists as a file or link,			with a file. If any path prefix of the file exists as a file or link,
	then it conflicts. If the file itself is a directory that contains any			then it conflicts. If the file itself is a directory that contains any
	file that is not tracked, then it conflicts.			file that is not tracked, then it conflicts.

	Returns the shortest path at which a conflict occurs, or None if there is			Returns the shortest path at which a conflict occurs, or None if there is
	no conflict.			no conflict.
	"""			"""
				if wctx.isinmemory():
				# Nothing to do in IMM for the same reason as ``_checkunknownfile``.
				return False

	# Check for path prefixes that exist as unknown files.			# Check for path prefixes that exist as unknown files.
	for p in reversed(list(util.finddirs(f))):			for p in reversed(list(util.finddirs(f))):
	if (repo.wvfs.audit.check(p)			if (repo.wvfs.audit.check(p)
	and repo.wvfs.isfileorlink(p)			and repo.wvfs.isfileorlink(p)
	and repo.dirstate.normalize(p) not in repo.dirstate):			and repo.dirstate.normalize(p) not in repo.dirstate):
	return p			return p

	elif config == 'warn':			elif config == 'warn':
	warnconflicts.update(conflicts)			warnconflicts.update(conflicts)

	for f, (m, args, msg) in actions.iteritems():			for f, (m, args, msg) in actions.iteritems():
	if m in ('c', 'dc'):			if m in ('c', 'dc'):
	if _checkunknownfile(repo, wctx, mctx, f):			if _checkunknownfile(repo, wctx, mctx, f):
	fileconflicts.add(f)			fileconflicts.add(f)
	elif pathconfig and f not in wctx:			elif pathconfig and f not in wctx:
	path = _checkunknowndirs(repo, f)			path = _checkunknowndirs(repo, wctx, f)
	if path is not None:			if path is not None:
	pathconflicts.add(path)			pathconflicts.add(path)
	elif m == 'dg':			elif m == 'dg':
	if _checkunknownfile(repo, wctx, mctx, f, args[0]):			if _checkunknownfile(repo, wctx, mctx, f, args[0]):
	fileconflicts.add(f)			fileconflicts.add(f)

	allconflicts = fileconflicts \| pathconflicts			allconflicts = fileconflicts \| pathconflicts
	ignoredconflicts = set([c for c in allconflicts			ignoredconflicts = set([c for c in allconflicts

This is an archive of the discontinued Mercurial Phabricator instance.

merge: don't check for unknown files in IMMClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 3559

mercurial/merge.py

merge: don't check for unknown files in IMM
ClosedPublic

Revision Contents
Changeset List