This is an archive of the discontinued Mercurial Phabricator instance.

Differential D238

context: rename troubles into instabilities
ClosedPublic

Authored by lothiraldan on Aug 7 2017, 6:07 AM.

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHGab0c55c2ad9a: context: rename troubles into instabilities

Summary

Rename troubles context method into instabilities.

Copy the old troubles method and add a deprecation warning. This way
extensions calling troubles will see the deprecation warning but will not
break due to new return values.

The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

lothiraldan created this revision.Aug 7 2017, 6:07 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 7 2017, 6:07 AM

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

lothiraldan added a child revision: D239: context: rename unstable into orphan.Aug 7 2017, 6:08 AM

indygreg requested changes to this revision.Aug 8 2017, 12:36 AM

indygreg added a subscriber: indygreg.

indygreg added inline comments.

mercurial/context.py
246–248	This feels like it should be a set not a list. Should this be changed as part of changing the API?
mercurial/exchange.py
684–686	Why does this only print 1 instability?

This revision now requires changes to proceed.Aug 8 2017, 12:36 AM

lothiraldan added inline comments.Aug 8 2017, 6:35 AM

mercurial/context.py
246–248	Semantically I agree, but the list has the nice property of being sorted. If we change it to a set, I think we would be forced to sort it in order to have stable test outputs.
mercurial/exchange.py
684–686	I think it was easier to display a message when considering a single trouble. We could do better, but I'm not sure how displaying all troubles would interact with translation.

durin42 added a subscriber: durin42.Aug 8 2017, 10:57 AM

durin42 added inline comments.

mercurial/exchange.py
684–686	Let's add a TODO about this?

lothiraldan edited edge metadata.Aug 9 2017, 2:07 AM

lothiraldan updated this revision to Diff 664.

lothiraldan marked 3 inline comments as done.Aug 9 2017, 4:43 AM

Closed by commit rHGab0c55c2ad9a: context: rename troubles into instabilities (authored by lothiraldan). · Explain WhyAug 9 2017, 11:36 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/cmdutil.py (7 lines)
M			mercurial/commands.py (5 lines)
M			mercurial/context.py (31 lines)
M			mercurial/exchange.py (4 lines)
M			mercurial/templatekw.py (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	583		Aug 7 2017, 6:07 AM	★	★
Diff 2	664		Aug 9 2017, 2:07 AM	★	★
Diff 3	694	rHGab0c55c2ad9ac2e3bce8bceb4151588c52bd0169	Aug 2 2017, 12:34 PM	★	★

Status	Author	Revision
Closed	lothiraldan	D259 label: rename log.trouble into log.instability
Closed	lothiraldan	D258 label: rename trouble.X into instability.X
Closed	lothiraldan	D257 label: rename changeset.troubled into changeset.unstable
Closed	lothiraldan	D256 test: add a test for stabilization related labels
Closed	lothiraldan	D255 obsolete: rename bumped volatile set into phasedivergent volatile set
Closed	lothiraldan	D254 obsolete: rename divergent volatile set into contentdivergent volatile set
Closed	lothiraldan	D253 obsolete: rename unstable volatile set into orphan volatile set
Closed	lothiraldan	D252 revset: rename bumped into phasedivergent
Closed	lothiraldan	D251 revset: remane divergent into contentdivergent
Closed	lothiraldan	D250 revset: rename unstable into orphan
Closed	lothiraldan	D249 test: update evolution config
Closed	lothiraldan	D248 config: rename evolution config into stabilization
Closed	lothiraldan	D247 obsutil: rename allprecursors into allpredecessors
Closed	lothiraldan	D246 obsolete: rename precursor into predecessor in obsolete docstrings
Closed	lothiraldan	D245 obsstore: rename precursors into predecessors
Closed	lothiraldan	D244 obsolete: rename _addprecursors into _addpredecessors
Closed	lothiraldan	D243 obsmarker: rename precnode into prednode
Closed	lothiraldan	D242 context: rename troubled into isunstable
Closed	lothiraldan	D241 context: rename bumped into phasedivergent
Closed	lothiraldan	D240 context: rename divergent into contentdivergent
Closed	lothiraldan	D239 context: rename unstable into orphan
Closed	lothiraldan	D238 context: rename troubles into instabilities
Closed	lothiraldan	D237 template: rename troubles templatekw into instabilities
Closed	lothiraldan	D216 evolution: rename bumped to phase-divergent
Closed	lothiraldan	D215 evolution: rename divergent to content-divergent
Closed	lothiraldan	D214 evolution: rename unstable to orphan
Closed	lothiraldan	D213 evolution: rename trouble(s) to instability

Diff 664

mercurial/cmdutil.py

	stat=stat, fp=fp, prefix=prefix)			stat=stat, fp=fp, prefix=prefix)

	def _changesetlabels(ctx):			def _changesetlabels(ctx):
	labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()]			labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()]
	if ctx.obsolete():			if ctx.obsolete():
	labels.append('changeset.obsolete')			labels.append('changeset.obsolete')
	if ctx.troubled():			if ctx.troubled():
	labels.append('changeset.troubled')			labels.append('changeset.troubled')
	for trouble in ctx.troubles():			for instability in ctx.instabilities():
	labels.append('trouble.%s' % trouble)			labels.append('trouble.%s' % instability)
	return ' '.join(labels)			return ' '.join(labels)

	class changeset_printer(object):			class changeset_printer(object):
	'''show changeset information when templating not requested.'''			'''show changeset information when templating not requested.'''

	def __init__(self, ui, repo, matchfn, diffopts, buffered):			def __init__(self, ui, repo, matchfn, diffopts, buffered):
	self.ui = ui			self.ui = ui
	self.repo = repo			self.repo = repo
	self.ui.write(_("user: %s\n") % ctx.user(),			self.ui.write(_("user: %s\n") % ctx.user(),
	label='log.user')			label='log.user')
	# i18n: column positioning for "hg log"			# i18n: column positioning for "hg log"
	self.ui.write(_("date: %s\n") % date,			self.ui.write(_("date: %s\n") % date,
	label='log.date')			label='log.date')

	if ctx.troubled():			if ctx.troubled():
	# i18n: column positioning for "hg log"			# i18n: column positioning for "hg log"
	self.ui.write(_("instability: %s\n") % ', '.join(ctx.troubles()),			instabilities = ctx.instabilities()
				self.ui.write(_("instability: %s\n") % ', '.join(instabilities),
	label='log.trouble')			label='log.trouble')

	self._exthook(ctx)			self._exthook(ctx)

	if self.ui.debugflag:			if self.ui.debugflag:
	files = ctx.p1().status(ctx)[:3]			files = ctx.p1().status(ctx)[:3]
	for key, value in zip([# i18n: column positioning for "hg log"			for key, value in zip([# i18n: column positioning for "hg log"
	_("files:"),			_("files:"),

mercurial/commands.py

	if p.rev() == -1:			if p.rev() == -1:
	if not len(repo):			if not len(repo):
	ui.write(_(' (empty repository)'))			ui.write(_(' (empty repository)'))
	else:			else:
	ui.write(_(' (no revision checked out)'))			ui.write(_(' (no revision checked out)'))
	if p.obsolete():			if p.obsolete():
	ui.write(_(' (obsolete)'))			ui.write(_(' (obsolete)'))
	if p.troubled():			if p.troubled():
				instabilities = (ui.label(instability, 'trouble.%s' % instability)
				for instability in p.instabilities())
	ui.write(' ('			ui.write(' ('
	+ ', '.join(ui.label(trouble, 'trouble.%s' % trouble)			+ ', '.join(instabilities)
	for trouble in p.troubles())
	+ ')')			+ ')')
	ui.write('\n')			ui.write('\n')
	if p.description():			if p.description():
	ui.status(' ' + p.description().splitlines()[0].strip() + '\n',			ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
	label='log.summary')			label='log.summary')

	branch = ctx.branch()			branch = ctx.branch()
	bheads = repo.branchheads(branch)			bheads = repo.branchheads(branch)

mercurial/context.py

	"""			"""
	return self.rev() in obsmod.getrevs(self._repo, 'divergent')			return self.rev() in obsmod.getrevs(self._repo, 'divergent')

	def troubled(self):			def troubled(self):
	"""True if the changeset is either unstable, bumped or divergent"""			"""True if the changeset is either unstable, bumped or divergent"""
	return self.unstable() or self.bumped() or self.divergent()			return self.unstable() or self.bumped() or self.divergent()

	def troubles(self):			def troubles(self):
	"""return the list of troubles affecting this changesets.			"""Keep the old version around in order to avoid breaking extensions
				about different return values.
				"""
				msg = ("'context.troubles' is deprecated, "
				"use 'context.instabilities'")
				self._repo.ui.deprecwarn(msg, '4.4')

				troubles = []
				if self.unstable():
				troubles.append('orphan')
				if self.bumped():
				troubles.append('bumped')
				if self.divergent():
				troubles.append('divergent')
				return troubles

				def instabilities(self):
				"""return the list of instabilities affecting this changeset.

	Troubles are returned as strings. possible values are:			Instabilities are returned as strings. possible values are:
				indygregUnsubmitted Not Done This feels like it should be a set not a list. Should this be changed as part of changing the API? indygreg: This feels like it should be a set not a list. Should this be changed as part of changing the…
				lothiraldanAuthorUnsubmitted Not Done Semantically I agree, but the list has the nice property of being sorted. If we change it to a set, I think we would be forced to sort it in order to have stable test outputs. lothiraldan: Semantically I agree, but the list has the nice property of being sorted. If we change it to a…
	- orphan,			- orphan,
	- phase-divergent,			- phase-divergent,
	- content-divergent.			- content-divergent.
	"""			"""
	troubles = []			instabilities = []
	if self.unstable():			if self.unstable():
	troubles.append('orphan')			instabilities.append('orphan')
	if self.bumped():			if self.bumped():
	troubles.append('phase-divergent')			instabilities.append('phase-divergent')
	if self.divergent():			if self.divergent():
	troubles.append('content-divergent')			instabilities.append('content-divergent')
	return troubles			return instabilities

	def parents(self):			def parents(self):
	"""return contexts for each parent changeset"""			"""return contexts for each parent changeset"""
	return self._parents			return self._parents

	def p1(self):			def p1(self):
	return self._parents[0]			return self._parents[0]

mercurial/exchange.py

	# obsolete or unstable changeset in missing, at			# obsolete or unstable changeset in missing, at
	# least one of the missinghead will be obsolete or			# least one of the missinghead will be obsolete or
	# unstable. So checking heads only is ok			# unstable. So checking heads only is ok
	for node in outgoing.missingheads:			for node in outgoing.missingheads:
	ctx = unfi[node]			ctx = unfi[node]
	if ctx.obsolete():			if ctx.obsolete():
	raise error.Abort(mso % ctx)			raise error.Abort(mso % ctx)
	elif ctx.troubled():			elif ctx.troubled():
	raise error.Abort(mst[ctx.troubles()[0]] % ctx)			# TODO print more than one instability in the abort
				# message
				raise error.Abort(mst[ctx.instabilities()[0]] % ctx)
				indygregUnsubmitted Done Why does this only print 1 instability? indygreg: Why does this only print 1 instability?
				lothiraldanAuthorUnsubmitted Done I think it was easier to display a message when considering a single trouble. We could do better, but I'm not sure how displaying all troubles would interact with translation. lothiraldan: I think it was easier to display a message when considering a single trouble. We could do…
				durin42Unsubmitted Done Let's add a TODO about this? durin42: Let's add a TODO about this?

	discovery.checkheads(pushop)			discovery.checkheads(pushop)
	return True			return True

	# List of names of steps to perform for an outgoing bundle2, order matters.			# List of names of steps to perform for an outgoing bundle2, order matters.
	b2partsgenorder = []			b2partsgenorder = []

	# Mapping between step name and function			# Mapping between step name and function

mercurial/templatekw.py


	@templatekeyword('instabilities')			@templatekeyword('instabilities')
	def showinstabilities(**args):			def showinstabilities(**args):
	"""List of strings. Evolution instabilities affecting the changeset.			"""List of strings. Evolution instabilities affecting the changeset.

	(EXPERIMENTAL)			(EXPERIMENTAL)
	"""			"""
	args = pycompat.byteskwargs(args)			args = pycompat.byteskwargs(args)
	return showlist('trouble', args['ctx'].troubles(), args)			return showlist('trouble', args['ctx'].instabilities(), args)

	# tell hggettext to extract docstrings from these functions:			# tell hggettext to extract docstrings from these functions:
	i18nfunctions = keywords.values()			i18nfunctions = keywords.values()