This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7998

merge: replace a repo.lookup('.') by more typical repo['.'].node()
ClosedPublic

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

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG293cab97a766: merge: replace a repo.lookup('.') by more typical repo['.'].node()

Summary

The repo.lookup('.') form comes from b3311e26f94f (merge: fix
--preview to show all nodes that will be merged (issue2043).,
2010-02-15). I don't know why that commit changed from repo['.'],
but I don't think there's any reason to do that. Note that performance
should not be a reason (anymore?), because repo.lookup() is
implemented by first creating a context object.

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: D7999: merge: make hg.merge() take a context instead of a node.Jan 24 2020, 7:16 PM

pulkit accepted this revision.Jan 24 2020, 8:32 PM

This revision is now accepted and ready to land.Jan 24 2020, 8:32 PM

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

martinvonz added a commit: rHG293cab97a766: merge: replace a repo.lookup('.') by more typical repo['.'].node().Jan 25 2020, 7:26 PM

Closed by commit rHG293cab97a766: merge: replace a repo.lookup('.') by more typical repo['.'].node() (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commands.py (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	19589		Jan 24 2020, 7:16 PM	★	★
Diff 2	19604		Jan 25 2020, 1:05 AM	★	★
Diff 3	19617	rHG293cab97a766298d154db62dda731d5a7eb5839b	Jan 24 2020, 6:18 PM	★	★

Commit	Parents	Author	Summary	Date
13223df30e9a	3d29a46c0976	Martin von Zweigbergk		Jan 24 2020, 6:18 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 19604

mercurial/commands.py

	)			)
	node = repo[destutil.destmerge(repo)].node()			node = repo[destutil.destmerge(repo)].node()

	if node is None:			if node is None:
	raise error.Abort(_(b'merging with the working copy has no effect'))			raise error.Abort(_(b'merging with the working copy has no effect'))

	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.lookup(b'.')			p1 = repo[b'.'].node()
	p2 = node			p2 = 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