This is an archive of the discontinued Mercurial Phabricator instance.

Differential D213

evolution: rename trouble(s) to instability
ClosedPublic

Authored by lothiraldan on Aug 2 2017, 4:23 AM.

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHG6f4bc9688ca9: evolution: rename trouble(s) to instability

Summary

Rename trouble(s) to instability in all external user-facing output. Only
update user-facing output for the moment, variables names, templates keyword
and potentially configuration would be done in later series.

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 2 2017, 4:23 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 2 2017, 4:23 AM

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

lothiraldan added a child revision: D214: evolution: rename unstable to orphan.Aug 2 2017, 4:23 AM

durin42 accepted this revision.Aug 2 2017, 11:18 AM

This revision is now accepted and ready to land.Aug 2 2017, 11:18 AM

Closed by commit rHG6f4bc9688ca9: evolution: rename trouble(s) to instability (authored by lothiraldan). · Explain WhyAug 2 2017, 11:33 AM

This revision was automatically updated to reflect the committed changes.

lothiraldan updated this revision to Diff 578.Aug 7 2017, 6:07 AM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/cmdutil.py (2 lines)
M			tests/test-commit-amend.t (2 lines)
M			tests/test-obsmarker-template.t (16 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	496		Aug 2 2017, 4:23 AM	★	★
Diff 2	504	rHG6f4bc9688ca9fc6efd8654b1eaa51f8828a9e85b	Aug 1 2017, 11:39 AM	★	★
Diff 3	578		Aug 7 2017, 6:06 AM	★	★

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 504

mercurial/cmdutil.py

	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(_("trouble: %s\n") % ', '.join(ctx.troubles()),			self.ui.write(_("instability: %s\n") % ', '.join(ctx.troubles()),
	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:"),

tests/test-commit-amend.t


	$ hg commit --amend			$ hg commit --amend
	$ hg log -r 'unstable()'			$ hg log -r 'unstable()'
	changeset: 18:b99e5df575f7			changeset: 18:b99e5df575f7
	branch: a			branch: a
	parent: 11:3334b7925910			parent: 11:3334b7925910
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	trouble: unstable			instability: unstable
	summary: babar			summary: babar


	Amend a merge changeset (with renames and conflicts from the second parent):			Amend a merge changeset (with renames and conflicts from the second parent):

	$ hg up -q default			$ hg up -q default
	$ hg branch -q bar			$ hg branch -q bar
	$ hg cp a aa			$ hg cp a aa

tests/test-obsmarker-template.t

	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg commit --amend -m "A2"			$ hg commit --amend -m "A2"
	$ hg log --hidden -G			$ hg log --hidden -G
	@ changeset: 3:65b757b745b9			@ changeset: 3:65b757b745b9
	\| tag: tip			\| tag: tip
	\| parent: 0:ea207398892e			\| parent: 0:ea207398892e
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| trouble: divergent			\| instability: divergent
	\| summary: A2			\| summary: A2
	\|			\|
	\| o changeset: 2:fdf9bde5129a			\| o changeset: 2:fdf9bde5129a
	\|/ parent: 0:ea207398892e			\|/ parent: 0:ea207398892e
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| trouble: divergent			\| instability: divergent
	\| summary: A1			\| summary: A1
	\|			\|
	\| x changeset: 1:471f378eab4c			\| x changeset: 1:471f378eab4c
	\|/ user: test			\|/ user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: A0			\| summary: A0
	\|			\|
	o changeset: 0:ea207398892e			o changeset: 0:ea207398892e
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: ROOT			summary: ROOT

	$ hg commit --amend -m 'A3'			$ hg commit --amend -m 'A3'
	$ hg log --hidden -G			$ hg log --hidden -G
	@ changeset: 4:019fadeab383			@ changeset: 4:019fadeab383
	\| tag: tip			\| tag: tip
	\| parent: 0:ea207398892e			\| parent: 0:ea207398892e
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| trouble: divergent			\| instability: divergent
	\| summary: A3			\| summary: A3
	\|			\|
	\| x changeset: 3:65b757b745b9			\| x changeset: 3:65b757b745b9
	\|/ parent: 0:ea207398892e			\|/ parent: 0:ea207398892e
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: A2			\| summary: A2
	\|			\|
	\| o changeset: 2:fdf9bde5129a			\| o changeset: 2:fdf9bde5129a
	\|/ parent: 0:ea207398892e			\|/ parent: 0:ea207398892e
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| trouble: divergent			\| instability: divergent
	\| summary: A1			\| summary: A1
	\|			\|
	\| x changeset: 1:471f378eab4c			\| x changeset: 1:471f378eab4c
	\|/ user: test			\|/ user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: A0			\| summary: A0
	\|			\|
	o changeset: 0:ea207398892e			o changeset: 0:ea207398892e
	$ hg commit --amend -m "Add B only"			$ hg commit --amend -m "Add B only"

	$ hg log -G			$ hg log -G
	@ changeset: 9:0b997eb7ceee			@ changeset: 9:0b997eb7ceee
	\| tag: tip			\| tag: tip
	\| parent: 5:dd800401bd8c			\| parent: 5:dd800401bd8c
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| trouble: divergent			\| instability: divergent
	\| summary: Add B only			\| summary: Add B only
	\|			\|
	\| o changeset: 8:b18bc8331526			\| o changeset: 8:b18bc8331526
	\|/ parent: 5:dd800401bd8c			\|/ parent: 5:dd800401bd8c
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| trouble: divergent			\| instability: divergent
	\| summary: Add only B			\| summary: Add only B
	\|			\|
	\| o changeset: 7:ba2ed02b0c9a			\| o changeset: 7:ba2ed02b0c9a
	\| \| user: test			\| \| user: test
	\| \| date: Thu Jan 01 00:00:00 1970 +0000			\| \| date: Thu Jan 01 00:00:00 1970 +0000
	\| \| trouble: unstable, divergent			\| \| instability: unstable, divergent
	\| \| summary: Add A,B,C			\| \| summary: Add A,B,C
	\| \|			\| \|
	\| x changeset: 6:4a004186e638			\| x changeset: 6:4a004186e638
	\|/ user: test			\|/ user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: Add A,B,C			\| summary: Add A,B,C
	\|			\|
	o changeset: 5:dd800401bd8c			o changeset: 5:dd800401bd8c
	\| parent: 3:f897c6137566			\| parent: 3:f897c6137566
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| trouble: divergent			\| instability: divergent
	\| summary: Add A,B,C			\| summary: Add A,B,C
	\|			\|
	o changeset: 3:f897c6137566			o changeset: 3:f897c6137566
	\| parent: 0:ea207398892e			\| parent: 0:ea207398892e
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: C0			\| summary: C0
	\|			\|