This is an archive of the discontinued Mercurial Phabricator instance.

Differential D777

merge: add merge action 'pr' to rename files during update
ClosedPublic

Authored by mbthomas on Sep 22 2017, 5:28 AM.

Download Raw Diff

Details

Reviewers

ryanmce

Group Reviewers

hg-reviewers

Commits

rHGb4955650eb57: merge: add merge action 'pr' to rename files during update
rHG57b888b9c75a: merge: add merge action 'pr' to rename files during update

Summary

Add a new merge action to handle a path conflict by renaming the conflicting
file to a safe name.

The rename is just to avoid problems on the filesystem. The conflict is still
considered unresolved until the user marks the original path as resolved.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

mbthomas created this revision.Sep 22 2017, 5:28 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 22 2017, 5:28 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

mbthomas added a child revision: D778: merge: backup conflicting directories when getting files.Sep 22 2017, 5:28 AM

Looks good. One question inline.

mercurial/merge.py
1463	Thanks for remembering to preserve copy information! Did you test with transitive renames? Something like: I rename `a` -> `b` I run `hg update @` and `@` has a new directory `b` Then `b` gets renamed to `b.blahblah` Does this properly cover the rename from `a` to `b.blahblah` after that?

mbthomas added inline comments.Sep 26 2017, 10:58 AM

mercurial/merge.py
1463	I had tested transitive renames after update, but not before. I'll fix it up and add a test.

mbthomas updated this revision to Diff 2213.Oct 1 2017, 5:32 AM

mbthomas marked 2 inline comments as done.Oct 1 2017, 5:51 AM

mbthomas updated this revision to Diff 2354.Oct 2 2017, 5:15 PM

mbthomas added inline comments.Oct 5 2017, 12:03 PM

mercurial/merge.py
1463	Test added as `Update - local renamed file conflicts with remote directory` in D786.

lgtm

Closed by commit rHG57b888b9c75a: merge: add merge action 'pr' to rename files during update (authored by mbthomas). · Explain WhyOct 9 2017, 9:25 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/merge.py (29 lines)
M			mercurial/sparse.py (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	1995		Sep 22 2017, 5:28 AM	★	★
Diff 2	2213		Oct 1 2017, 5:32 AM	★	★
Diff 3	2354		Oct 2 2017, 5:15 PM	★	★
Diff 4	2548	rHG57b888b9c75a91180cd489a194ab6ffa9711aee9	Oct 2 2017, 5:05 PM	★	★

Status	Author	Revision
Closed	mbthomas	D955 merge: improve comments in mergestate._makerecords
Closed	mbthomas	D861 commands: tidy up merge state decoding in resolve
Closed	mbthomas	D787 tests: add test for path conflicts during merge
Closed	mbthomas	D786 tests: add test for path conflicts during update
Closed	mbthomas	D785 context: also consider path conflicts when clearing unknown files
Closed	mbthomas	D784 merge: check for path conflicts when merging (issue5628)
Closed	mbthomas	D783 util: add safename function for generating safe names to rename to
Closed	mbthomas	D782 merge: improve error messages for path conflicts during update
Closed	mbthomas	D781 merge: check for path conflicts when updating (issue5628)
Closed	mbthomas	D780 merge: rename conflicts to fileconflicts in _checkunknownfiles
Closed	mbthomas	D779 merge: add _checkunknowndirs function for detecting path conflicts
Closed	mbthomas	D778 merge: backup conflicting directories when getting files
Closed	mbthomas	D777 merge: add merge action 'pr' to rename files during update
Closed	mbthomas	D776 merge: add merge action 'p' to record path conflicts during update
Closed	mbthomas	D775 commands: update the resolve command to handle path conflicts
Closed	mbthomas	D774 merge: add pathconflict merge state
Closed	mbthomas	D773 tests: add a test demonstrating basic path conflict failures
Closed	mbthomas	D680 scmutil: handle conflicting files and dirs in origbackuppath
Closed	mbthomas	D679 scmutil: don't append .orig to backups in origbackuppath

Diff 2354

mercurial/merge.py

	s(_("the local file has been renamed to %s\n") % f1)			s(_("the local file has been renamed to %s\n") % f1)
	else:			else:
	s(_("the remote file has been renamed to %s\n") % f1)			s(_("the remote file has been renamed to %s\n") % f1)
	s(_("resolve manually then use 'hg resolve --mark %s'\n") % f)			s(_("resolve manually then use 'hg resolve --mark %s'\n") % f)
	ms.addpath(f, f1, fo)			ms.addpath(f, f1, fo)
	z += 1			z += 1
	progress(_updating, z, item=f, total=numupdates, unit=_files)			progress(_updating, z, item=f, total=numupdates, unit=_files)

	# remove in parallel (must come before getting)			# remove in parallel (must come before resolving path conflicts and getting)
	prog = worker.worker(repo.ui, 0.001, batchremove, (repo, wctx),			prog = worker.worker(repo.ui, 0.001, batchremove, (repo, wctx),
	actions['r'])			actions['r'])
	for i, item in prog:			for i, item in prog:
	z += i			z += i
	progress(_updating, z, item=item, total=numupdates, unit=_files)			progress(_updating, z, item=item, total=numupdates, unit=_files)
	removed = len(actions['r'])			removed = len(actions['r'])

				# resolve path conflicts (must come before getting)
				for f, args, msg in actions['pr']:
				repo.ui.debug(" %s: %s -> pr\n" % (f, msg))
				f0, = args
				if wctx[f0].lexists():
				repo.ui.note(_("moving %s to %s\n") % (f0, f))
				wctx[f].audit()
				wctx[f].write(wctx.filectx(f0).data(), wctx.filectx(f0).flags())
				wctx[f0].remove()
				z += 1
				progress(_updating, z, item=f, total=numupdates, unit=_files)

	# We should flush before forking into worker processes, since those workers			# We should flush before forking into worker processes, since those workers
	# flush when they complete, and we don't want to duplicate work.			# flush when they complete, and we don't want to duplicate work.
	wctx.flushall()			wctx.flushall()

	# get in parallel			# get in parallel
	prog = worker.worker(repo.ui, 0.001, batchget, (repo, mctx, wctx),			prog = worker.worker(repo.ui, 0.001, batchget, (repo, mctx, wctx),
	actions['g'])			actions['g'])
	for i, item in prog:			for i, item in prog:
	repo.dirstate.remove(f)			repo.dirstate.remove(f)
	else:			else:
	repo.dirstate.drop(f)			repo.dirstate.drop(f)

	# forget (must come first)			# forget (must come first)
	for f, args, msg in actions.get('f', []):			for f, args, msg in actions.get('f', []):
	repo.dirstate.drop(f)			repo.dirstate.drop(f)

				# resolve path conflicts
				for f, args, msg in actions.get('pr', []):
				f0, = args
				origf0 = repo.dirstate.copied(f0) or f0
				repo.dirstate.add(f)
				repo.dirstate.copy(origf0, f)
				ryanmceUnsubmitted Done Thanks for remembering to preserve copy information! Did you test with transitive renames? Something like: I rename `a` -> `b` I run `hg update @` and `@` has a new directory `b` Then `b` gets renamed to `b.blahblah` Does this properly cover the rename from `a` to `b.blahblah` after that? ryanmce: Thanks for remembering to preserve copy information! Did you test with transitive renames?
				mbthomasAuthorUnsubmitted Done I had tested transitive renames after update, but not before. I'll fix it up and add a test. mbthomas: I had tested transitive renames after update, but not before. I'll fix it up and add a test.
				mbthomasAuthorUnsubmitted Not Done Test added as `Update - local renamed file conflicts with remote directory` in D786. mbthomas: Test added as `Update - local renamed file conflicts with remote directory` in D786.
				if f0 == origf0:
				repo.dirstate.remove(f0)
				else:
				repo.dirstate.drop(f0)

	# re-add			# re-add
	for f, args, msg in actions.get('a', []):			for f, args, msg in actions.get('a', []):
	repo.dirstate.add(f)			repo.dirstate.add(f)

	# re-add/mark as modified			# re-add/mark as modified
	for f, args, msg in actions.get('am', []):			for f, args, msg in actions.get('am', []):
	if branchmerge:			if branchmerge:
	repo.dirstate.normallookup(f)			repo.dirstate.normallookup(f)

	### calculate phase			### calculate phase
	actionbyfile, diverge, renamedelete = calculateupdates(			actionbyfile, diverge, renamedelete = calculateupdates(
	repo, wc, p2, pas, branchmerge, force, mergeancestor,			repo, wc, p2, pas, branchmerge, force, mergeancestor,
	followcopies, matcher=matcher, mergeforce=mergeforce)			followcopies, matcher=matcher, mergeforce=mergeforce)

	if updatecheck == 'noconflict':			if updatecheck == 'noconflict':
	for f, (m, args, msg) in actionbyfile.iteritems():			for f, (m, args, msg) in actionbyfile.iteritems():
	if m not in ('g', 'k', 'e', 'r'):			if m not in ('g', 'k', 'e', 'r', 'pr'):
	msg = _("conflicting changes")			msg = _("conflicting changes")
	hint = _("commit or update --clean to discard changes")			hint = _("commit or update --clean to discard changes")
	raise error.Abort(msg, hint=hint)			raise error.Abort(msg, hint=hint)

	# Prompt and create actions. Most of this is in the resolve phase			# Prompt and create actions. Most of this is in the resolve phase
	# already, but we can't handle .hgsubstate in filemerge or			# already, but we can't handle .hgsubstate in filemerge or
	# subrepo.submerge yet so we have to keep prompting for it.			# subrepo.submerge yet so we have to keep prompting for it.
	if '.hgsubstate' in actionbyfile:			if '.hgsubstate' in actionbyfile:
	"use (c)hanged version or leave (d)eleted?"			"use (c)hanged version or leave (d)eleted?"
	"$$ &Changed $$ &Deleted") % prompts, 0) == 0:			"$$ &Changed $$ &Deleted") % prompts, 0) == 0:
	actionbyfile[f] = ('g', (flags, False), "prompt recreating")			actionbyfile[f] = ('g', (flags, False), "prompt recreating")
	else:			else:
	del actionbyfile[f]			del actionbyfile[f]

	# Convert to dictionary-of-lists format			# Convert to dictionary-of-lists format
	actions = dict((m, [])			actions = dict((m, [])
	for m in 'a am f g cd dc r dm dg m e k p'.split())			for m in 'a am f g cd dc r dm dg m e k p pr'.split())
	for f, (m, args, msg) in actionbyfile.iteritems():			for f, (m, args, msg) in actionbyfile.iteritems():
	if m not in actions:			if m not in actions:
	actions[m] = []			actions[m] = []
	actions[m].append((f, args, msg))			actions[m].append((f, args, msg))

	if not util.fscasesensitive(repo.path):			if not util.fscasesensitive(repo.path):
	# check collision between files only in p2 for clean update			# check collision between files only in p2 for clean update
	if (not branchmerge and			if (not branchmerge and

mercurial/sparse.py

	if not file in files:			if not file in files:
	old = origsparsematch(file)			old = origsparsematch(file)
	new = sparsematch(file)			new = sparsematch(file)
	if old and not new:			if old and not new:
	dropped.append(file)			dropped.append(file)

	# Apply changes to disk			# Apply changes to disk
	typeactions = dict((m, [])			typeactions = dict((m, [])
	for m in 'a f g am cd dc r dm dg m e k p'.split())			for m in 'a f g am cd dc r dm dg m e k p pr'.split())
	for f, (m, args, msg) in actions.iteritems():			for f, (m, args, msg) in actions.iteritems():
	if m not in typeactions:			if m not in typeactions:
	typeactions[m] = []			typeactions[m] = []
	typeactions[m].append((f, args, msg))			typeactions[m].append((f, args, msg))

	mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False)			mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False)

	# Fix dirstate			# Fix dirstate