This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6638

abort: removed labels argument from abortmerge()
ClosedPublic

Authored by taapas1128 on Jul 10 2019, 5:41 PM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG209f2b8a50dc: abort: removed labels argument from abortmerge()
rHG8d03ee731751: abort: removed labels argument from abortmerge()

Summary

Labels are used to label the code that belongs to working copy and merge rev
in case of a conflicted state.
No such labelling is required while aborting merge as conflicted parts
are reverted to normal.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Jul 10 2019, 5:41 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJul 10 2019, 5:41 PM

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

However when merge is aborted there is no unresolved merge in progress and hence

This needs to be reworded.

no labels are required.

taapas1128 edited the summary of this revision. (Show Details)Jul 11 2019, 9:28 AM

taapas1128 updated this revision to Diff 15889.

Updated that is it fine now ?

pulkit accepted this revision.Jul 15 2019, 9:50 AM

This revision is now accepted and ready to land.Jul 15 2019, 9:50 AM

taapas1128 added a commit: rHG8d03ee731751: abort: removed labels argument from abortmerge().Jul 15 2019, 10:14 AM

Closed by commit rHG8d03ee731751: abort: removed labels argument from abortmerge() (authored by taapas1128). · Explain Why

This revision was automatically updated to reflect the committed changes.

taapas1128 added a commit: rHG209f2b8a50dc: abort: removed labels argument from abortmerge().Jul 15 2019, 7:45 PM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/hg.py (7 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	15886		Jul 10 2019, 5:41 PM	★	★
Diff 2	15889		Jul 11 2019, 9:28 AM	★	★
Diff 3	15911	rHG8d03ee7317515229e720fe634ca7a7695b24d546	Jul 10 2019, 5:38 PM	★	★

Commit	Parents	Author	Summary	Date
51202407d7a7	3bc400ccbf99	Taapas Agrawal		Jul 10 2019, 5:38 PM

Diff 15886

mercurial/hg.py


	return ret			return ret

	def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None,			def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None,
	abort=False):			abort=False):
	"""Branch merge with node, resolving changes. Return true if any			"""Branch merge with node, resolving changes. Return true if any
	unresolved conflicts."""			unresolved conflicts."""
	if abort:			if abort:
	return abortmerge(repo.ui, repo, labels=labels)			return abortmerge(repo.ui, repo)

	stats = mergemod.update(repo, node, branchmerge=True, force=force,			stats = mergemod.update(repo, node, branchmerge=True, force=force,
	mergeforce=mergeforce, labels=labels)			mergeforce=mergeforce, labels=labels)
	_showstats(repo, stats)			_showstats(repo, stats)
	if stats.unresolvedcount:			if stats.unresolvedcount:
	repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "			repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
	"or 'hg merge --abort' to abandon\n"))			"or 'hg merge --abort' to abandon\n"))
	elif remind:			elif remind:
	repo.ui.status(_("(branch merge, don't forget to commit)\n"))			repo.ui.status(_("(branch merge, don't forget to commit)\n"))
	return stats.unresolvedcount > 0			return stats.unresolvedcount > 0

	def abortmerge(ui, repo, labels=None):			def abortmerge(ui, repo):
	ms = mergemod.mergestate.read(repo)			ms = mergemod.mergestate.read(repo)
	if ms.active():			if ms.active():
	# there were conflicts			# there were conflicts
	node = ms.localctx.hex()			node = ms.localctx.hex()
	else:			else:
	# there were no conficts, mergestate was not stored			# there were no conficts, mergestate was not stored
	node = repo['.'].hex()			node = repo['.'].hex()

	repo.ui.status(_("aborting the merge, updating back to"			repo.ui.status(_("aborting the merge, updating back to"
	" %s\n") % node[:12])			" %s\n") % node[:12])
	stats = mergemod.update(repo, node, branchmerge=False, force=True,			stats = mergemod.update(repo, node, branchmerge=False, force=True)
	labels=labels)
	_showstats(repo, stats)			_showstats(repo, stats)
	return stats.unresolvedcount > 0			return stats.unresolvedcount > 0

	def _incoming(displaychlist, subreporecurse, ui, repo, source,			def _incoming(displaychlist, subreporecurse, ui, repo, source,
	opts, buffered=False):			opts, buffered=False):
	"""			"""
	Helper for incoming / gincoming.			Helper for incoming / gincoming.
	displaychlist gets called with			displaychlist gets called with