context: rename troubled into isunstable
ClosedPublic

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

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG52c5ff856b49: context: rename troubled into isunstable

Summary

As we changed the meaning of unstable between the old vocabulary and the new
one, we can't reuse the unstable method name at the risk of breaking
extensions calling unstable and getting a wrong result.

Instead rename troubled into isunstable so extensions will continue to work.

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

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

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

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

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

lothiraldan added a child revision: D243: obsmarker: rename precnode into prednode.Aug 7 2017, 6:08 AM

lothiraldan updated this revision to Diff 626.Aug 8 2017, 10:09 AM

lothiraldan updated this revision to Diff 665.Aug 9 2017, 2:07 AM

Closed by commit rHG52c5ff856b49: context: rename troubled into isunstable (authored by lothiraldan). · Explain WhyAug 9 2017, 11:36 AM

This revision was automatically updated to reflect the committed changes.

lothiraldan updated this revision to Diff 704.Aug 9 2017, 1:19 PM

yuja added a subscriber: yuja.Aug 13 2017, 1:01 AM

yuja added inline comments.

mercurial/context.py
246	Please send a follow-up. This is too far from the tip to amend.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/cmdutil.py (4 lines)
M			mercurial/commands.py (2 lines)
M			mercurial/context.py (6 lines)
M			mercurial/exchange.py (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	587		Aug 7 2017, 6:08 AM	★	★
Diff 2	626		Aug 8 2017, 10:09 AM	★	★
Diff 3	665		Aug 9 2017, 2:07 AM	★	★
Diff 4	700	rHG52c5ff856b49ac8f2a4eadda6dc9dbb070f39a3f	Aug 2 2017, 1:13 PM	★	★
Diff 5	704		Aug 9 2017, 1:19 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 700

mercurial/cmdutil.py

	submatch = matchmod.subdirmatcher(subpath, match)			submatch = matchmod.subdirmatcher(subpath, match)
	sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,			sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
	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.isunstable():
	labels.append('changeset.troubled')			labels.append('changeset.troubled')
	for instability in ctx.instabilities():			for instability in ctx.instabilities():
	labels.append('trouble.%s' % instability)			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.'''

	label='ui.debug log.manifest')			label='ui.debug log.manifest')
	# i18n: column positioning for "hg log"			# i18n: column positioning for "hg log"
	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.isunstable():
	# i18n: column positioning for "hg log"			# i18n: column positioning for "hg log"
	instabilities = ctx.instabilities()			instabilities = ctx.instabilities()
	self.ui.write(_("instability: %s\n") % ', '.join(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:

mercurial/commands.py

	marks.extend(p.bookmarks())			marks.extend(p.bookmarks())
	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.isunstable():
	instabilities = (ui.label(instability, 'trouble.%s' % instability)			instabilities = (ui.label(instability, 'trouble.%s' % instability)
	for instability in p.instabilities())			for instability in p.instabilities())
	ui.write(' ('			ui.write(' ('
	+ ', '.join(instabilities)			+ ', '.join(instabilities)
	+ ')')			+ ')')
	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',

mercurial/context.py

	def contentdivergent(self):			def contentdivergent(self):
	"""Is a successors of a changeset with multiple possible successors set			"""Is a successors of a changeset with multiple possible successors set

	Only non-public and non-obsolete changesets may be divergent.			Only non-public and non-obsolete changesets may be divergent.
	"""			"""
	return self.rev() in obsmod.getrevs(self._repo, 'divergent')			return self.rev() in obsmod.getrevs(self._repo, 'divergent')

	def troubled(self):			def troubled(self):
				msg = ("'context.troubled' is deprecated, "
				"use 'context.isunstable'")
				self._repo.ui.deprecwarn(msg, '4.4')
				return self.unstable()
				yujaUnsubmitted Not Done Please send a follow-up. This is too far from the tip to amend. yuja: Please send a follow-up. This is too far from the tip to amend.

				def isunstable(self):
	"""True if the changeset is either unstable, bumped or divergent"""			"""True if the changeset is either unstable, bumped or divergent"""
	return self.orphan() or self.phasedivergent() or self.contentdivergent()			return self.orphan() or self.phasedivergent() or self.contentdivergent()

	def troubles(self):			def troubles(self):
	"""Keep the old version around in order to avoid breaking extensions			"""Keep the old version around in order to avoid breaking extensions
	about different return values.			about different return values.
	"""			"""
	msg = ("'context.troubles' is deprecated, "			msg = ("'context.troubles' is deprecated, "

mercurial/exchange.py

	# If we are to push if there is at least one			# If we are to push if there is at least one
	# 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.isunstable():
	# TODO print more than one instability in the abort			# TODO print more than one instability in the abort
	# message			# message
	raise error.Abort(mst[ctx.instabilities()[0]] % ctx)			raise error.Abort(mst[ctx.instabilities()[0]] % ctx)

	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.

This is an archive of the discontinued Mercurial Phabricator instance.

context: rename troubled into isunstableClosedPublic