This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	3064		Oct 23 2017, 3:44 PM	★	★
Diff 2	3555		Nov 16 2017, 1:00 AM	★	★
Diff 3	3561		Nov 16 2017, 1:16 AM	★	★
Diff 4	4171	rHG1b03407e808d5b0beb7a1165c9aad4193e65360f	Dec 1 2017, 3:07 AM	★	★

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 4171

mercurial/merge.py

	elif pas == [p1]:			elif pas == [p1]:
	if not mergeancestor and wc.branch() == p2.branch():			if not mergeancestor and wc.branch() == p2.branch():
	raise error.Abort(_("nothing to merge"),			raise error.Abort(_("nothing to merge"),
	hint=_("use 'hg update' "			hint=_("use 'hg update' "
	"or check 'hg heads'"))			"or check 'hg heads'"))
	if not force and (wc.files() or wc.deleted()):			if not force and (wc.files() or wc.deleted()):
	raise error.Abort(_("uncommitted changes"),			raise error.Abort(_("uncommitted changes"),
	hint=_("use 'hg status' to list changes"))			hint=_("use 'hg status' to list changes"))
				if not wc.isinmemory():
	for s in sorted(wc.substate):			for s in sorted(wc.substate):
	wc.sub(s).bailifchanged()			wc.sub(s).bailifchanged()

	elif not overwrite:			elif not overwrite:
	if p1 == p2: # no-op update			if p1 == p2: # no-op update
	# call the hooks and exit early			# call the hooks and exit early
	repo.hook('preupdate', throw=True, parent1=xp2, parent2='')			repo.hook('preupdate', throw=True, parent1=xp2, parent2='')
	repo.hook('update', parent1=xp2, parent2='', error=0)			repo.hook('update', parent1=xp2, parent2='', error=0)
	return 0, 0, 0, 0			return 0, 0, 0, 0

	repo.ui.warn(_("note: possible conflict - %s was deleted "			repo.ui.warn(_("note: possible conflict - %s was deleted "
	"and renamed to:\n") % f)			"and renamed to:\n") % f)
	for nf in fl:			for nf in fl:
	repo.ui.warn(" %s\n" % nf)			repo.ui.warn(" %s\n" % nf)

	### apply phase			### apply phase
	if not branchmerge: # just jump to the new rev			if not branchmerge: # just jump to the new rev
	fp1, fp2, xp1, xp2 = fp2, nullid, xp2, ''			fp1, fp2, xp1, xp2 = fp2, nullid, xp2, ''
	if not partial:			if not partial and not wc.isinmemory():
	repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)			repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
	# note that we're in the middle of an update			# note that we're in the middle of an update
	repo.vfs.write('updatestate', p2.hex())			repo.vfs.write('updatestate', p2.hex())

	# Advertise fsmonitor when its presence could be useful.			# Advertise fsmonitor when its presence could be useful.
	#			#
	# We only advertise when performing an update from an empty working			# We only advertise when performing an update from an empty working
	# directory. This typically only occurs during initial clone.			# directory. This typically only occurs during initial clone.
	and pycompat.sysplatform.startswith(('linux', 'darwin'))):			and pycompat.sysplatform.startswith(('linux', 'darwin'))):
	repo.ui.warn(			repo.ui.warn(
	_('(warning: large working directory being used without '			_('(warning: large working directory being used without '
	'fsmonitor enabled; enable fsmonitor to improve performance; '			'fsmonitor enabled; enable fsmonitor to improve performance; '
	'see "hg help -e fsmonitor")\n'))			'see "hg help -e fsmonitor")\n'))

	stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels)			stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels)

	if not partial:			if not partial and not wc.isinmemory():
	with repo.dirstate.parentchange():			with repo.dirstate.parentchange():
	repo.setparents(fp1, fp2)			repo.setparents(fp1, fp2)
	recordupdates(repo, actions, branchmerge)			recordupdates(repo, actions, branchmerge)
	# update completed, clear state			# update completed, clear state
	util.unlink(repo.vfs.join('updatestate'))			util.unlink(repo.vfs.join('updatestate'))

	if not branchmerge:			if not branchmerge:
	repo.dirstate.setbranch(p2.branch())			repo.dirstate.setbranch(p2.branch())

This is an archive of the discontinued Mercurial Phabricator instance.

merge: skip subrepo state, update hooks, and updating the dirstate in IMMClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 4171

mercurial/merge.py

merge: skip subrepo state, update hooks, and updating the dirstate in IMM
ClosedPublic

Revision Contents
Changeset List