This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7999

merge: make hg.merge() take a context instead of a node
ClosedPublic

Authored by martinvonz on Jan 24 2020, 7:16 PM.

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHG2f290136b7d6: merge: make hg.merge() take a context instead of a node

Summary

Many callers already have a repo, so we might as well pass
that. merge.update() will look up the context object later. This
patch is part of making it so we pass around the context object all
the way down instead.

I also removed the repo argument since it can be retrieved from the
context.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

martinvonz created this revision.Jan 24 2020, 7:16 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJan 24 2020, 7:16 PM

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

martinvonz added a child revision: D8000: mq: don't tell user to commit merge that we already committed.Jan 24 2020, 7:16 PM

martinvonz updated this revision to Diff 19605.Jan 25 2020, 1:05 AM

Breaks test-merge2.t but otherwise seems like a good series.

This revision now requires changes to proceed.Jan 29 2020, 6:09 PM

In D7999#118496, @durin42 wrote:

Breaks test-merge2.t but otherwise seems like a good series.

Doesn't break it for me (I think I just re-ran that test on all the commits in this series). I guess it's a (semantic) conflict with some other of my patches that have recently been queue. I'll rebase and try again once you're done with your current batch of queuing.

In D7999#118500, @martinvonz wrote:

In D7999#118496, @durin42 wrote:

Breaks test-merge2.t but otherwise seems like a good series.

Doesn't break it for me (I think I just re-ran that test on all the commits in this series). I guess it's a (semantic) conflict with some other of my patches that have recently been queue. I'll rebase and try again once you're done with your current batch of queuing.

Rebase done and it still passes for me. How does it fail for you? I wonder if it's flaky. I've seen one of those tests be flaky before.

martinvonz updated this revision to Diff 20435.Mar 3 2020, 5:08 PM

I've rebased the remaining two patches in this series. I'm still unable to get the test to fail.

martinvonz added a commit: rHG2f290136b7d6: merge: make hg.merge() take a context instead of a node.Mar 4 2020, 2:50 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG2f290136b7d6: merge: make hg.merge() take a context instead of a node (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/fetch.py (6 lines)
M			hgext/mq.py (2 lines)
M			mercurial/commands.py (12 lines)
M			mercurial/hg.py (5 lines)
M			mercurial/subrepo.py (2 lines)
M			relnotes/next (3 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	19590		Jan 24 2020, 7:16 PM	★	★
Diff 2	19605		Jan 25 2020, 1:05 AM	★	★
Diff 3	20435		Mar 3 2020, 5:08 PM	★	★
Diff 4	20486	rHG2f290136b7d67dba2e9633d2e24a94d7e024a03c	Jan 24 2020, 6:28 PM	★	★

Commit	Parents	Author	Summary	Date
8ce3f9aa258e	42350118235d	Martin von Zweigbergk		Jan 24 2020, 6:28 PM

Status	Author	Revision
Closed	martinvonz	D8000 mq: don't tell user to commit merge that we already committed
Closed	martinvonz	D7999 merge: make hg.merge() take a context instead of a node
Closed	martinvonz	D7998 merge: replace a repo.lookup('.') by more typical repo['.'].node()
Closed	martinvonz	D7997 merge: drop now-unused "abort" argument from hg.merge()
Closed	martinvonz	D7996 merge: don't auto-pick destination with `hg merge 'wdir()'`
Closed	martinvonz	D7995 merge: call hg.abortmerge() directly and return early
Closed	martinvonz	D7994 merge: check that there are no conflicts after --abort
Closed	martinvonz	D7993 merge: use check_incompatible_arguments() for --abort

Diff 19590

hgext/fetch.py

	firstparent, secondparent = newparent, newheads[0]			firstparent, secondparent = newparent, newheads[0]
	else:			else:
	firstparent, secondparent = newheads[0], newparent			firstparent, secondparent = newheads[0], newparent
	ui.status(			ui.status(
	_(b'updating to %d:%s\n')			_(b'updating to %d:%s\n')
	% (repo.changelog.rev(firstparent), short(firstparent))			% (repo.changelog.rev(firstparent), short(firstparent))
	)			)
	hg.clean(repo, firstparent)			hg.clean(repo, firstparent)
				p2ctx = repo[secondparent]
	ui.status(			ui.status(
	_(b'merging with %d:%s\n')			_(b'merging with %d:%s\n') % (p2ctx.rev(), short(secondparent))
	% (repo.changelog.rev(secondparent), short(secondparent))
	)			)
	err = hg.merge(repo, secondparent, remind=False)			err = hg.merge(p2ctx, remind=False)

	if not err:			if not err:
	# we don't translate commit messages			# we don't translate commit messages
	message = cmdutil.logmessage(ui, opts) or (			message = cmdutil.logmessage(ui, opts) or (
	b'Automated merge with %s' % util.removeauth(other.url())			b'Automated merge with %s' % util.removeauth(other.url())
	)			)
	editopt = opts.get(b'edit') or opts.get(b'force_editor')			editopt = opts.get(b'edit') or opts.get(b'force_editor')
	editor = cmdutil.getcommiteditor(edit=editopt, editform=b'fetch')			editor = cmdutil.getcommiteditor(edit=editopt, editform=b'fetch')

hgext/mq.py


	self.ui.warn(_(b"patch didn't work out, merging %s\n") % patch)			self.ui.warn(_(b"patch didn't work out, merging %s\n") % patch)

	# apply failed, strip away that rev and merge.			# apply failed, strip away that rev and merge.
	hg.clean(repo, head)			hg.clean(repo, head)
	strip(self.ui, repo, [n], update=False, backup=False)			strip(self.ui, repo, [n], update=False, backup=False)

	ctx = repo[rev]			ctx = repo[rev]
	ret = hg.merge(repo, rev)			ret = hg.merge(ctx)
	if ret:			if ret:
	raise error.Abort(_(b"update returned %d") % ret)			raise error.Abort(_(b"update returned %d") % ret)
	n = newcommit(repo, None, ctx.description(), ctx.user(), force=True)			n = newcommit(repo, None, ctx.description(), ctx.user(), force=True)
	if n is None:			if n is None:
	raise error.Abort(_(b"repo commit failed"))			raise error.Abort(_(b"repo commit failed"))
	try:			try:
	ph = patchheader(mergeq.join(patch), self.plainmode)			ph = patchheader(mergeq.join(patch), self.plainmode)
	except Exception:			except Exception:

mercurial/commands.py

	)			)
	if opts.get(b'merge') and op1 != node:			if opts.get(b'merge') and op1 != node:
	hg.clean(repo, op1, show_stats=False)			hg.clean(repo, op1, show_stats=False)
	ui.status(			ui.status(
	_(b'merging with changeset %s\n') % nice(repo.changelog.tip())			_(b'merging with changeset %s\n') % nice(repo.changelog.tip())
	)			)
	overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}			overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
	with ui.configoverride(overrides, b'backout'):			with ui.configoverride(overrides, b'backout'):
	return hg.merge(repo, hex(repo.changelog.tip()))			return hg.merge(repo[b'tip'])
	return 0			return 0


	@command(			@command(
	b'bisect',			b'bisect',
	[			[
	(b'r', b'reset', False, _(b'reset bisect state')),			(b'r', b'reset', False, _(b'reset bisect state')),
	(b'g', b'good', False, _(b'mark changeset good')),			(b'g', b'good', False, _(b'mark changeset good')),
	return hg.abortmerge(repo.ui, repo)			return hg.abortmerge(repo.ui, repo)

	if opts.get(b'rev') and node:			if opts.get(b'rev') and node:
	raise error.Abort(_(b"please specify just one revision"))			raise error.Abort(_(b"please specify just one revision"))
	if not node:			if not node:
	node = opts.get(b'rev')			node = opts.get(b'rev')

	if node:			if node:
	node = scmutil.revsingle(repo, node).node()			ctx = scmutil.revsingle(repo, node)
	else:			else:
	if ui.configbool(b'commands', b'merge.require-rev'):			if ui.configbool(b'commands', b'merge.require-rev'):
	raise error.Abort(			raise error.Abort(
	_(			_(
	b'configuration requires specifying revision to merge '			b'configuration requires specifying revision to merge '
	b'with'			b'with'
	)			)
	)			)
	node = repo[destutil.destmerge(repo)].node()			ctx = repo[destutil.destmerge(repo)]

	if opts.get(b'preview'):			if opts.get(b'preview'):
	# find nodes that are ancestors of p2 but not of p1			# find nodes that are ancestors of p2 but not of p1
	p1 = repo[b'.'].node()			p1 = repo[b'.'].node()
	p2 = node			p2 = ctx.node()
	nodes = repo.changelog.findmissing(common=[p1], heads=[p2])			nodes = repo.changelog.findmissing(common=[p1], heads=[p2])

	displayer = logcmdutil.changesetdisplayer(ui, repo, opts)			displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
	for node in nodes:			for node in nodes:
	displayer.show(repo[node])			displayer.show(repo[node])
	displayer.close()			displayer.close()
	return 0			return 0

	# ui.forcemerge is an internal variable, do not document			# ui.forcemerge is an internal variable, do not document
	overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}			overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
	with ui.configoverride(overrides, b'merge'):			with ui.configoverride(overrides, b'merge'):
	force = opts.get(b'force')			force = opts.get(b'force')
	labels = [b'working copy', b'merge rev']			labels = [b'working copy', b'merge rev']
	return hg.merge(			return hg.merge(ctx, force=force, mergeforce=force, labels=labels)
	repo, node, force=force, mergeforce=force, labels=labels
	)


	statemod.addunfinished(			statemod.addunfinished(
	b'merge',			b'merge',
	fname=None,			fname=None,
	clearable=True,			clearable=True,
	allowcommit=True,			allowcommit=True,
	cmdmsg=_(b'outstanding uncommitted merge'),			cmdmsg=_(b'outstanding uncommitted merge'),

mercurial/hg.py


	if warndest:			if warndest:
	destutil.statusotherdests(ui, repo)			destutil.statusotherdests(ui, repo)

	return ret			return ret


	def merge(			def merge(
	repo, node, force=None, remind=True, mergeforce=False, labels=None,			ctx, force=None, remind=True, mergeforce=False, labels=None,
	):			):
	"""Branch merge with node, resolving changes. Return true if any			"""Branch merge with node, resolving changes. Return true if any
	unresolved conflicts."""			unresolved conflicts."""
				repo = ctx.repo()
	stats = mergemod.update(			stats = mergemod.update(
	repo,			repo,
	node,			ctx.node(),
	branchmerge=True,			branchmerge=True,
	force=force,			force=force,
	mergeforce=mergeforce,			mergeforce=mergeforce,
	labels=labels,			labels=labels,
	)			)
	_showstats(repo, stats)			_showstats(repo, stats)
	if stats.unresolvedcount:			if stats.unresolvedcount:
	repo.ui.status(			repo.ui.status(

mercurial/subrepo.py

	elif anc == dst:			elif anc == dst:
	self.ui.debug(			self.ui.debug(
	b'skipping subrepository "%s"\n' % subrelpath(self)			b'skipping subrepository "%s"\n' % subrelpath(self)
	)			)
	else:			else:
	self.ui.debug(			self.ui.debug(
	b'merging subrepository "%s"\n' % subrelpath(self)			b'merging subrepository "%s"\n' % subrelpath(self)
	)			)
	hg.merge(self._repo, state[1], remind=False)			hg.merge(dst, remind=False)

	wctx = self._repo[None]			wctx = self._repo[None]
	if self.dirty():			if self.dirty():
	if anc != dst:			if anc != dst:
	if _updateprompt(self.ui, self, wctx.dirty(), cur, dst):			if _updateprompt(self.ui, self, wctx.dirty(), cur, dst):
	mergefunc()			mergefunc()
	else:			else:
	mergefunc()			mergefunc()

relnotes/next


	== Internal API Changes ==			== Internal API Changes ==

	* The deprecated `ui.progress()` has now been deleted. Please use			* The deprecated `ui.progress()` has now been deleted. Please use
	`ui.makeprogress()` instead.			`ui.makeprogress()` instead.

	* `hg.merge()` has lost its `abort` argument. Please call			* `hg.merge()` has lost its `abort` argument. Please call
	`hg.abortmerge()` directly instead.			`hg.abortmerge()` directly instead.

				* `hg.merge()` now takes a `ctx` instead of the previous `repo` and
				`node` arguments.