This is an archive of the discontinued Mercurial Phabricator instance.

Differential D214

evolution: rename unstable to orphan
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG03039ff3082b: evolution: rename unstable to orphan
Summary

Rename unstable to orphan 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
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

lothiraldan created this revision.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 rHG03039ff3082b: evolution: rename unstable to orphan (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 579.Aug 7 2017, 6:07 AM

Revision Contents
Changeset List

Diff 579

mercurial/commands.py

if draft or secret: if draft or secret:
ui.status(_('phases: %s\n') % ', '.join(t)) ui.status(_('phases: %s\n') % ', '.join(t))
if obsolete.isenabled(repo, obsolete.createmarkersopt): if obsolete.isenabled(repo, obsolete.createmarkersopt):
for trouble in ("unstable", "divergent", "bumped"): for trouble in ("unstable", "divergent", "bumped"):
numtrouble = len(repo.revs(trouble + "()")) numtrouble = len(repo.revs(trouble + "()"))
# We write all the possibilities to ease translation # We write all the possibilities to ease translation
troublemsg = { troublemsg = {
"unstable": _("unstable: %d changesets"), "unstable": _("orphan: %d changesets"),
"divergent": _("divergent: %d changesets"), "divergent": _("divergent: %d changesets"),
"bumped": _("bumped: %d changesets"), "bumped": _("bumped: %d changesets"),
} }
if numtrouble > 0: if numtrouble > 0:
ui.status(troublemsg[trouble] % numtrouble + "\n") ui.status(troublemsg[trouble] % numtrouble + "\n")
cmdutil.summaryhooks(ui, repo) cmdutil.summaryhooks(ui, repo)

mercurial/context.py

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. """return the list of troubles affecting this changesets.
Troubles are returned as strings. possible values are: Troubles are returned as strings. possible values are:
- unstable, - orphan,
- bumped, - bumped,
- divergent. - divergent.
""" """
troubles = [] troubles = []
if self.unstable(): if self.unstable():
troubles.append('unstable') troubles.append('orphan')
if self.bumped(): if self.bumped():
troubles.append('bumped') troubles.append('bumped')
if self.divergent(): if self.divergent():
troubles.append('divergent') troubles.append('divergent')
return troubles return troubles
def parents(self): def parents(self):
"""return contexts for each parent changeset""" """return contexts for each parent changeset"""

mercurial/exchange.py

return False return False
# something to push # something to push
if not pushop.force: if not pushop.force:
# if repo.obsstore == False --> no obsolete # if repo.obsstore == False --> no obsolete
# then, save the iteration # then, save the iteration
if unfi.obsstore: if unfi.obsstore:
# this message are here for 80 char limit reason # this message are here for 80 char limit reason
mso = _("push includes obsolete changeset: %s!") mso = _("push includes obsolete changeset: %s!")
mst = {"unstable": _("push includes unstable changeset: %s!"), mst = {"orphan": _("push includes orphan changeset: %s!"),
"bumped": _("push includes bumped changeset: %s!"), "bumped": _("push includes bumped changeset: %s!"),
"divergent": _("push includes divergent changeset: %s!")} "divergent": _("push includes divergent changeset: %s!")}
# 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]

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
instability: unstable instability: orphan
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

| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: 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
| | instability: unstable, divergent | | instability: orphan, 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

tests/test-obsolete.t

$ mkcommit original_e $ mkcommit original_e
$ hg debugobsolete --record-parents `getid original_d` -d '0 0' $ hg debugobsolete --record-parents `getid original_d` -d '0 0'
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete | grep `getid original_d` $ hg debugobsolete | grep `getid original_d`
94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
$ hg log -r 'obsolete()' $ hg log -r 'obsolete()'
4:94b33453f93b (draft *obsolete*) [ ] add original_d 4:94b33453f93b (draft *obsolete*) [ ] add original_d
$ hg summary $ hg summary
parent: 5:cda648ca50f5 tip (unstable) parent: 5:cda648ca50f5 tip (orphan)
add original_e add original_e
branch: default branch: default
commit: (clean) commit: (clean)
update: 1 new changesets, 2 branch heads (merge) update: 1 new changesets, 2 branch heads (merge)
phases: 3 draft phases: 3 draft
unstable: 1 changesets orphan: 1 changesets
$ hg log -G -r '::unstable()' $ hg log -G -r '::unstable()'
@ 5:cda648ca50f5 (draft unstable) [tip ] add original_e @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e
| |
x 4:94b33453f93b (draft *obsolete*) [ ] add original_d x 4:94b33453f93b (draft *obsolete*) [ ] add original_d
| |
o 3:6f9641995072 (draft) [ ] add n3w_3_c o 3:6f9641995072 (draft) [ ] add n3w_3_c
| |
o 1:7c3bad9141dc (public) [ ] add b o 1:7c3bad9141dc (public) [ ] add b
| |
o 0:1f0dee641bb7 (public) [ ] add a o 0:1f0dee641bb7 (public) [ ] add a
refuse to push obsolete changeset refuse to push obsolete changeset
$ hg push ../tmpc/ -r 'desc("original_d")' $ hg push ../tmpc/ -r 'desc("original_d")'
pushing to ../tmpc/ pushing to ../tmpc/
searching for changes searching for changes
abort: push includes obsolete changeset: 94b33453f93b! abort: push includes obsolete changeset: 94b33453f93b!
[255] [255]
refuse to push unstable changeset refuse to push unstable changeset
$ hg push ../tmpc/ $ hg push ../tmpc/
pushing to ../tmpc/ pushing to ../tmpc/
searching for changes searching for changes
abort: push includes unstable changeset: cda648ca50f5! abort: push includes orphan changeset: cda648ca50f5!
[255] [255]
Test that extinct changeset are properly detected Test that extinct changeset are properly detected
$ hg log -r 'extinct()' $ hg log -r 'extinct()'
Don't try to push extinct changeset Don't try to push extinct changeset
$ hg init ../tmpf $ hg init ../tmpf
$ hg out ../tmpf $ hg out ../tmpf
comparing with ../tmpf comparing with ../tmpf
searching for changes searching for changes
0:1f0dee641bb7 (public) [ ] add a 0:1f0dee641bb7 (public) [ ] add a
1:7c3bad9141dc (public) [ ] add b 1:7c3bad9141dc (public) [ ] add b
2:245bde4270cd (public) [ ] add original_c 2:245bde4270cd (public) [ ] add original_c
3:6f9641995072 (draft) [ ] add n3w_3_c 3:6f9641995072 (draft) [ ] add n3w_3_c
4:94b33453f93b (draft *obsolete*) [ ] add original_d 4:94b33453f93b (draft *obsolete*) [ ] add original_d
5:cda648ca50f5 (draft unstable) [tip ] add original_e 5:cda648ca50f5 (draft orphan) [tip ] add original_e
$ hg push ../tmpf -f # -f because be push unstable too $ hg push ../tmpf -f # -f because be push unstable too
pushing to ../tmpf pushing to ../tmpf
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 6 changesets with 6 changes to 6 files (+1 heads) added 6 changesets with 6 changes to 6 files (+1 heads)
7 new obsolescence markers 7 new obsolescence markers
no warning displayed no warning displayed
$ hg push ../tmpf $ hg push ../tmpf
pushing to ../tmpf pushing to ../tmpf
searching for changes searching for changes
no changes found no changes found
[1] [1]
Do not warn about new head when the new head is a successors of a remote one Do not warn about new head when the new head is a successors of a remote one
$ hg log -G $ hg log -G
@ 5:cda648ca50f5 (draft unstable) [tip ] add original_e @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e
| |
x 4:94b33453f93b (draft *obsolete*) [ ] add original_d x 4:94b33453f93b (draft *obsolete*) [ ] add original_d
| |
o 3:6f9641995072 (draft) [ ] add n3w_3_c o 3:6f9641995072 (draft) [ ] add n3w_3_c
| |
| o 2:245bde4270cd (public) [ ] add original_c | o 2:245bde4270cd (public) [ ] add original_c
|/ |/
o 1:7c3bad9141dc (public) [ ] add b o 1:7c3bad9141dc (public) [ ] add b
$ hg debugobsolete `getid obsolete_e` $ hg debugobsolete `getid obsolete_e`
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete `getid original_c` `getid babar` $ hg debugobsolete `getid original_c` `getid babar`
$ hg log --config ui.logtemplate= -r 'bumped() and unstable()' $ hg log --config ui.logtemplate= -r 'bumped() and unstable()'
changeset: 7:50c51b361e60 changeset: 7:50c51b361e60
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
trouble: unstable, bumped instability: orphan, bumped
summary: add babar summary: add babar
test the "obsolete" templatekw test the "obsolete" templatekw
$ hg log -r 'obsolete()' $ hg log -r 'obsolete()'
6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e
test the "troubles" templatekw test the "troubles" templatekw
$ hg log -r 'bumped() and unstable()' $ hg log -r 'bumped() and unstable()'
7:50c51b361e60 (draft unstable bumped) [ ] add babar 7:50c51b361e60 (draft orphan bumped) [ ] add babar
test the default cmdline template test the default cmdline template
$ hg log -T default -r 'bumped()' $ hg log -T default -r 'bumped()'
changeset: 7:50c51b361e60 changeset: 7:50c51b361e60
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
trouble: unstable, bumped trouble: orphan, bumped
summary: add babar summary: add babar
$ hg log -T default -r 'obsolete()' $ hg log -T default -r 'obsolete()'
changeset: 6:3de5eca88c00 changeset: 6:3de5eca88c00
parent: 3:6f9641995072 parent: 3:6f9641995072
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: add obsolete_e summary: add obsolete_e
test summary output test summary output
$ hg up -r 'bumped() and unstable()' $ hg up -r 'bumped() and unstable()'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg summary $ hg summary
parent: 7:50c51b361e60 (unstable, bumped) parent: 7:50c51b361e60 (orphan, bumped)
add babar add babar
branch: default branch: default
commit: (clean) commit: (clean)
update: 2 new changesets (update) update: 2 new changesets (update)
phases: 4 draft phases: 4 draft
unstable: 2 changesets orphan: 2 changesets
bumped: 1 changesets bumped: 1 changesets
$ hg up -r 'obsolete()' $ hg up -r 'obsolete()'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg summary $ hg summary
parent: 6:3de5eca88c00 (obsolete) parent: 6:3de5eca88c00 (obsolete)
add obsolete_e add obsolete_e
branch: default branch: default
commit: (clean) commit: (clean)
update: 3 new changesets (update) update: 3 new changesets (update)
phases: 4 draft phases: 4 draft
unstable: 2 changesets orphan: 2 changesets
bumped: 1 changesets bumped: 1 changesets
Test incoming/outcoming with changesets obsoleted remotely, known locally Test incoming/outcoming with changesets obsoleted remotely, known locally
=============================================================================== ===============================================================================
This test issue 3805 This test issue 3805
$ hg init repo-issue3805 $ hg init repo-issue3805

tests/test-rebase-obsolete.t

| |
o 6:9c48361117de D o 6:9c48361117de D
| |
o 2:261e70097290 B2 o 2:261e70097290 B2
| |
o 0:4a2df7238c3b A o 0:4a2df7238c3b A
$ hg summary $ hg summary
parent: 15:73568ab6879d tip (unstable) parent: 15:73568ab6879d tip (orphan)
bar foo bar foo
branch: default branch: default
commit: (clean) commit: (clean)
update: 2 new changesets, 3 branch heads (merge) update: 2 new changesets, 3 branch heads (merge)
phases: 8 draft phases: 8 draft
unstable: 1 changesets orphan: 1 changesets
$ hg rebase -s 10 -d 12 $ hg rebase -s 10 -d 12
abort: this rebase will cause divergences from: 121d9e3bc4c6 abort: this rebase will cause divergences from: 121d9e3bc4c6
(to force the rebase please set experimental.allowdivergence=True) (to force the rebase please set experimental.allowdivergence=True)
[255] [255]
$ hg log -G $ hg log -G
@ 15:73568ab6879d bar foo @ 15:73568ab6879d bar foo
| |
| o 14:77d874d096a2 10' | o 14:77d874d096a2 10'