This is an archive of the discontinued Mercurial Phabricator instance.

Differential D781

merge: check for path conflicts when updating (issue5628)
ClosedPublic

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

Download Raw Diff

Details

Reviewers

ryanmce

Group Reviewers

hg-reviewers

Commits

rHG33c8a6837181: merge: check for path conflicts when updating (issue5628)
rHG61bca39f126d: merge: check for path conflicts when updating (issue5628)

Summary

When updating to a new revision, check for path conflicts caused by unknown
files in the working directory, and handle these by backing up the file or
directory and replacing it.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

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: D782: merge: improve error messages for path conflicts during update.Sep 22 2017, 5:28 AM

nice

tests/test-merge1.t
33–43	This behavior is so much better!

mbthomas mentioned this in D778: merge: backup conflicting directories when getting files.Sep 26 2017, 11:54 AM

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

mbthomas retitled this revision from merge: check for path conflicts when updating to merge: check for path conflicts when updating (issue5628).Oct 2 2017, 5:15 PM

mbthomas updated this revision to Diff 2358.

Still looks good. The test looks much better now!

Closed by commit rHG61bca39f126d: merge: check for path conflicts when updating (issue5628) (authored by mbthomas). · Explain WhyOct 9 2017, 9:30 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/merge.py (10 lines)
M			tests/test-merge1.t (10 lines)
M			tests/test-pathconflicts-basic.t (13 lines)
M			tests/test-update-names.t (3 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	1999		Sep 22 2017, 5:28 AM	★	★
Diff 2	2217		Oct 1 2017, 5:32 AM	★	★
Diff 3	2358		Oct 2 2017, 5:15 PM	★	★
Diff 4	2552	rHG61bca39f126d90564bb1dab25d31b277d28fd25e	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 2552

mercurial/merge.py


	def _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce):			def _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce):
	"""			"""
	Considers any actions that care about the presence of conflicting unknown			Considers any actions that care about the presence of conflicting unknown
	files. For some actions, the result is to abort; for others, it is to			files. For some actions, the result is to abort; for others, it is to
	choose a different action.			choose a different action.
	"""			"""
	fileconflicts = set()			fileconflicts = set()
				pathconflicts = set()
	warnconflicts = set()			warnconflicts = set()
	abortconflicts = set()			abortconflicts = set()
	unknownconfig = _getcheckunknownconfig(repo, 'merge', 'checkunknown')			unknownconfig = _getcheckunknownconfig(repo, 'merge', 'checkunknown')
	ignoredconfig = _getcheckunknownconfig(repo, 'merge', 'checkignored')			ignoredconfig = _getcheckunknownconfig(repo, 'merge', 'checkignored')
	if not force:			if not force:
	def collectconflicts(conflicts, config):			def collectconflicts(conflicts, config):
	if config == 'abort':			if config == 'abort':
	abortconflicts.update(conflicts)			abortconflicts.update(conflicts)
	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 f not in wctx:
				path = _checkunknowndirs(repo, f)
				if path is not None:
				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			allconflicts = fileconflicts \| pathconflicts
	ignoredconflicts = set([c for c in allconflicts			ignoredconflicts = set([c for c in allconflicts
	if repo.dirstate._ignore(c)])			if repo.dirstate._ignore(c)])
	unknownconflicts = allconflicts - ignoredconflicts			unknownconflicts = allconflicts - ignoredconflicts
	collectconflicts(ignoredconflicts, ignoredconfig)			collectconflicts(ignoredconflicts, ignoredconfig)
	collectconflicts(unknownconflicts, unknownconfig)			collectconflicts(unknownconflicts, unknownconfig)
	else:			else:
	for f, (m, args, msg) in actions.iteritems():			for f, (m, args, msg) in actions.iteritems():
	if m == 'cm':			if m == 'cm':
	if abortconflicts:			if abortconflicts:
	raise error.Abort(_("untracked files in working directory "			raise error.Abort(_("untracked files in working directory "
	"differ from files in requested revision"))			"differ from files in requested revision"))

	for f in sorted(warnconflicts):			for f in sorted(warnconflicts):
	repo.ui.warn(_("%s: replacing untracked file\n") % f)			repo.ui.warn(_("%s: replacing untracked file\n") % f)

	for f, (m, args, msg) in actions.iteritems():			for f, (m, args, msg) in actions.iteritems():
	backup = f in fileconflicts
	if m == 'c':			if m == 'c':
				backup = (f in fileconflicts or f in pathconflicts or
				any(p in pathconflicts for p in util.finddirs(f)))
	flags, = args			flags, = args
	actions[f] = ('g', (flags, backup), msg)			actions[f] = ('g', (flags, backup), msg)

	def _forgetremoved(wctx, mctx, branchmerge):			def _forgetremoved(wctx, mctx, branchmerge):
	"""			"""
	Forget removed files			Forget removed files

	If we're jumping between revisions (as opposed to merging), and if			If we're jumping between revisions (as opposed to merging), and if

tests/test-merge1.t

	$ hg update 0			$ hg update 0
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved

	Test interrupted updates by having a non-empty dir with the same name as one			Test interrupted updates by having a non-empty dir with the same name as one
	of the files in a commit we're updating to			of the files in a commit we're updating to

	$ mkdir b && touch b/nonempty			$ mkdir b && touch b/nonempty
	$ hg up			$ hg up
	abort: *: '$TESTTMP/t/b' (glob)			b: untracked file differs
				abort: untracked files in working directory differ from files in requested revision
	[255]			[255]
	$ hg ci			$ hg ci
	abort: last update was interrupted			nothing changed
	(use 'hg update' to get a consistent checkout)			[1]
	[255]
	$ hg sum			$ hg sum
	parent: 0:538afb845929			parent: 0:538afb845929
	commit #0			commit #0
	branch: default			branch: default
	commit: 1 unknown (interrupted update)			commit: 1 unknown (clean)
				ryanmceUnsubmitted Not Done This behavior is so much better! ryanmce: This behavior is so much better!
	update: 1 new changesets (update)			update: 1 new changesets (update)
	phases: 2 draft			phases: 2 draft
	$ rm b/nonempty			$ rm b/nonempty
	$ hg up			$ hg up
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg sum			$ hg sum
	parent: 1:b8bb4a988f25 tip			parent: 1:b8bb4a988f25 tip
	commit #1			commit #1

tests/test-pathconflicts-basic.t

	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved

	Basic update - local directory conflicts with remote file			Basic update - local directory conflicts with remote file

	$ hg up -q 0			$ hg up -q 0
	$ mkdir a			$ mkdir a
	$ echo 3 > a/b			$ echo 3 > a/b
	$ hg up file			$ hg up file
	abort: *: '$TESTTMP/repo/a' (glob)			a: untracked file differs
				abort: untracked files in working directory differ from files in requested revision
	[255]			[255]
	$ hg up --clean file			$ hg up --clean file
	abort: *: '$TESTTMP/repo/a' (glob)			abort: *: '$TESTTMP/repo/a' (glob)
	[255]			[255]

	Repo is in a very bad state now - recover manually			Repo is in a very bad state now - recover manually

	$ rm -r a			$ rm -r a
	$ hg up -q --clean 0			$ hg up -q --clean 0

	Basic update - untracked file conflicts with remote directory			Basic update - untracked file conflicts with remote directory

	$ hg up -q 0			$ hg up -q 0
	$ echo untracked > a			$ echo untracked > a
	$ hg up --config merge.checkunknown=warn dir			$ hg up --config merge.checkunknown=warn dir
	abort: *: '$TESTTMP/repo/a/b' (glob)			a: replacing untracked file
	[255]			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(activating bookmark dir)
	Repo is in a very bad state now - recover manually

	$ rm -f a
	$ hg up -q --clean 0

	Basic clean update - local directory conflicts with changed remote file			Basic clean update - local directory conflicts with changed remote file

	$ hg up -q file			$ hg up -q file
	$ rm a			$ rm a
	$ mkdir a			$ mkdir a
	$ echo 4 > a/b			$ echo 4 > a/b
	$ hg up file2			$ hg up file2

tests/test-update-names.t

	make sure that this does not erase untracked data			make sure that this does not erase untracked data
	$ hg up 0			$ hg up 0
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ mkdir name			$ mkdir name
	$ echo text > name/file			$ echo text > name/file
	$ hg st			$ hg st
	? name/file			? name/file
	$ hg up 1			$ hg up 1
	abort: *: '$TESTTMP/r1/r2/name' (glob)			name: untracked file differs
				abort: untracked files in working directory differ from files in requested revision
	[255]			[255]
	$ cd ..			$ cd ..

	#if symlink			#if symlink

	Test update when two commits have symlinks that point to different folders			Test update when two commits have symlinks that point to different folders
	$ hg init r3 && cd r3			$ hg init r3 && cd r3
	$ echo root > root && hg ci -Am root			$ echo root > root && hg ci -Am root