This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2001		Sep 22 2017, 5:28 AM	★	★
Diff 2	2219		Oct 1 2017, 5:33 AM	★	★
Diff 3	2360		Oct 2 2017, 5:15 PM	★	★
Diff 4	2554	rHGb8b2804ba00dd4fb5cf51d74b6b8d6acd9fcce5e	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 2554

	import codecs			import codecs
	import collections			import collections
	import contextlib			import contextlib
	import datetime			import datetime
	import errno			import errno
	import gc			import gc
	import hashlib			import hashlib
	import imp			import imp
				import itertools
	import mmap			import mmap
	import os			import os
	import platform as pyplatform			import platform as pyplatform
	import re as remod			import re as remod
	import shutil			import shutil
	import signal			import signal
	import socket			import socket
	import stat			import stat
	items[bt[0]] = value			items[bt[0]] = value

	return items			return items

	i18nfunctions = bundlecompressiontopics().values()			i18nfunctions = bundlecompressiontopics().values()

	# convenient shortcut			# convenient shortcut
	dst = debugstacktrace			dst = debugstacktrace

				def safename(f, tag, ctx, others=None):
				"""
				Generate a name that it is safe to rename f to in the given context.

				f: filename to rename
				tag: a string tag that will be included in the new name
				ctx: a context, in which the new name must not exist
				others: a set of other filenames that the new name must not be in

				Returns a file name of the form oldname~tag[~number] which does not exist
				in the provided context and is not in the set of other names.
				"""
				if others is None:
				others = set()

				fn = '%s~%s' % (f, tag)
				if fn not in ctx and fn not in others:
				return fn
				for n in itertools.count(1):
				fn = '%s~%s~%s' % (f, tag, n)
				if fn not in ctx and fn not in others:
				return fn