This is an archive of the discontinued Mercurial Phabricator instance.

mercurial/merge.py
1251–1260	I've seen this trick used in the mercurial codebase to fit more on a single line: s = repo.ui.status ... s(_("%s: path conflict - a file or link has the same name as a directory\n") % f) ... s(_("resolve manually then use 'hg resolve --mark %s'\n") % f) ... It may help to tighten up the code a bit here.
1714	future refactoring opportunity! -- this is incredibly ugly, but it's not your fault.
mercurial/sparse.py
490	Another future refactoring opportunity.

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

mbthomas marked an inline comment as done.Oct 1 2017, 6:38 AM

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

lgtm

Closed by commit rHG337512875503: merge: add merge action 'p' to record path conflicts during update (authored by mbthomas). · Explain WhyOct 9 2017, 9:25 PM

This revision was automatically updated to reflect the committed changes.

What test verifies this behavior? Do we need a new one?

Revision Contents
Changeset List

			Path	Packages
M			mercurial/merge.py (22 lines)
M			mercurial/sparse.py (3 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	1994		Sep 22 2017, 5:27 AM	★	★
Diff 2	2212		Oct 1 2017, 5:32 AM	★	★
Diff 3	2353		Oct 2 2017, 5:15 PM	★	★
Diff 4	2547	rHG33751287550332ad38713939315177f8858d9746	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 2212

mercurial/merge.py

	# remove renamed files after safely stored			# remove renamed files after safely stored
	for f in moves:			for f in moves:
	if wctx[f].lexists():			if wctx[f].lexists():
	repo.ui.debug("removing %s\n" % f)			repo.ui.debug("removing %s\n" % f)
	wctx[f].audit()			wctx[f].audit()
	wctx[f].remove()			wctx[f].remove()

	numupdates = sum(len(l) for m, l in actions.items() if m != 'k')			numupdates = sum(len(l) for m, l in actions.items() if m != 'k')
				z = 0

	if [a for a in actions['r'] if a[0] == '.hgsubstate']:			if [a for a in actions['r'] if a[0] == '.hgsubstate']:
	subrepo.submerge(repo, wctx, mctx, wctx, overwrite, labels)			subrepo.submerge(repo, wctx, mctx, wctx, overwrite, labels)

	# remove in parallel (must come first)			# record path conflicts
	z = 0			for f, args, msg in actions['p']:
				f1, fo = args
				s = repo.ui.status
				s(_("%s: path conflict - a file or link has the same name as a "
				"directory\n") % f)
				if fo == 'l':
				s(_("the local file has been renamed to %s\n") % f1)
				else:
				s(_("the remote file has been renamed to %s\n") % f1)
				s(_("resolve manually then use 'hg resolve --mark %s'\n") % f)
				ms.addpath(f, f1, fo)
				z += 1
				ryanmceUnsubmitted Done I've seen this trick used in the mercurial codebase to fit more on a single line: s = repo.ui.status ... s(_("%s: path conflict - a file or link has the same name as a directory\n") % f) ... s(_("resolve manually then use 'hg resolve --mark %s'\n") % f) ... It may help to tighten up the code a bit here. ryanmce: I've seen this trick used in the mercurial codebase to fit more on a single line: ``` s = repo.
				progress(_updating, z, item=f, total=numupdates, unit=_files)

				# remove in parallel (must come before 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'])

	# We should flush before forking into worker processes, since those workers			# We should flush before forking into worker processes, since those workers
	_("other%(o)s changed %(f)s which local%(l)s deleted\n"			_("other%(o)s changed %(f)s which local%(l)s deleted\n"
	"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, []) for m in 'a am f g cd dc r dm dg m e k'.split())			actions = dict((m, [])
				for m in 'a am f g cd dc r dm dg m e k p'.split())
				ryanmceUnsubmitted Not Done future refactoring opportunity! -- this is incredibly ugly, but it's not your fault. ryanmce: future refactoring opportunity! -- this is incredibly ugly, but it's not your fault.
	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

	for file, state in dirstate.iteritems():			for file, state in dirstate.iteritems():
	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, []) for m in 'a f g am cd dc r dm dg m e k'.split())			typeactions = dict((m, [])
				for m in 'a f g am cd dc r dm dg m e k p'.split())
				ryanmceUnsubmitted Not Done Another future refactoring opportunity. ryanmce: Another future refactoring opportunity.
	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

This is an archive of the discontinued Mercurial Phabricator instance.

merge: add merge action 'p' to record path conflicts during updateClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 2212

mercurial/merge.py

mercurial/sparse.py

merge: add merge action 'p' to record path conflicts during update
ClosedPublic

Revision Contents
Changeset List