D214: evolution: rename unstable to orphan
lothiraldan updated this revision to Diff 579. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D214?vs=505&id=579 REVISION DETAIL https://phab.mercurial-scm.org/D214 AFFECTED FILES mercurial/commands.py mercurial/context.py mercurial/exchange.py tests/test-commit-amend.t tests/test-obsmarker-template.t tests/test-obsolete.t tests/test-rebase-obsolete.t CHANGE DETAILS diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -793,13 +793,13 @@ o 0:4a2df7238c3b A $ hg summary - parent: 15:73568ab6879d tip (unstable) + parent: 15:73568ab6879d tip (orphan) bar foo branch: default commit: (clean) update: 2 new changesets, 3 branch heads (merge) phases: 8 draft - unstable: 1 changesets + orphan: 1 changesets $ hg rebase -s 10 -d 12 abort: this rebase will cause divergences from: 121d9e3bc4c6 (to force the rebase please set experimental.allowdivergence=True) diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -520,15 +520,15 @@ $ hg log -r 'obsolete()' 4:94b33453f93b (draft *obsolete*) [ ] add original_d $ hg summary - parent: 5:cda648ca50f5 tip (unstable) + parent: 5:cda648ca50f5 tip (orphan) add original_e branch: default commit: (clean) update: 1 new changesets, 2 branch heads (merge) phases: 3 draft - unstable: 1 changesets + orphan: 1 changesets $ 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 | @@ -552,7 +552,7 @@ $ hg push ../tmpc/ pushing to ../tmpc/ searching for changes - abort: push includes unstable changeset: cda648ca50f5! + abort: push includes orphan changeset: cda648ca50f5! [255] Test that extinct changeset are properly detected @@ -570,7 +570,7 @@ 2:245bde4270cd (public) [ ] add original_c 3:6f9641995072 (draft) [ ] add n3w_3_c 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 pushing to ../tmpf searching for changes @@ -591,7 +591,7 @@ Do not warn about new head when the new head is a successors of a remote one $ 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 | @@ -914,7 +914,7 @@ changeset: 7:50c51b361e60 user:test date:Thu Jan 01 00:00:00 1970 + - trouble: unstable, bumped + instability: orphan, bumped summary: add babar @@ -926,15 +926,15 @@ test the "troubles" templatekw $ 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 $ hg log -T default -r 'bumped()' changeset: 7:50c51b361e60 user:test date:Thu Jan 01 00:00:00 1970 + - trouble: unstable, bumped + trouble: orphan, bumped summary: add babar $ hg log -T default -r 'obsolete()' @@ -950,13 +950,13 @@ $ hg up -r 'bumped() and unstable()' 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg summary - parent: 7:50c51b361e60 (unstable, bumped) + parent: 7:50c51b361e60 (orphan, bumped) add babar branch: default commit: (clean) update: 2 new changesets (update) phases: 4 draft - unstable: 2 changesets + orphan: 2 changesets bumped: 1 changesets $ hg up -r 'obsolete()' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -967,7 +967,7 @@ commit: (clean) update: 3 new changesets (update) phases: 4 draft - unstable: 2 changesets + orphan: 2 changesets bumped: 1 changesets Test incoming/outcoming with changesets obsoleted remotely, known locally diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t --- a/tests/test-obsmarker-template.t +++ b/tests/test-obsmarker-template.t @@ -1099,7 +1099,7 @@ | o changeset: 7:ba2ed02b0c9a | | user:test | | date:Thu Jan 01 00:00:00 1970 + - | | instability: unstable, divergent + | | instability: orphan, divergent | | summary: Add A,B,C | | | x changeset: 6:4a004186e638 diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t --- a/tests/test-commit-amend.t +++ b/tests/test-commit-amend.t @@ -610,7 +610,7 @@ parent: 11:3334b7925910 user:test date:Thu Jan 01 00:00:00 1970 + - instability: unstable + instability: orphan summary: babar diff --git a/m
D214: evolution: rename unstable to orphan
This revision was automatically updated to reflect the committed changes. Closed by commit rHG03039ff3082b: evolution: rename unstable to orphan (authored by lothiraldan). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D214?vs=497&id=505 REVISION DETAIL https://phab.mercurial-scm.org/D214 AFFECTED FILES mercurial/commands.py mercurial/context.py mercurial/exchange.py tests/test-commit-amend.t tests/test-obsmarker-template.t tests/test-obsolete.t tests/test-rebase-obsolete.t CHANGE DETAILS diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -793,13 +793,13 @@ o 0:4a2df7238c3b A $ hg summary - parent: 15:73568ab6879d tip (unstable) + parent: 15:73568ab6879d tip (orphan) bar foo branch: default commit: (clean) update: 2 new changesets, 3 branch heads (merge) phases: 8 draft - unstable: 1 changesets + orphan: 1 changesets $ hg rebase -s 10 -d 12 abort: this rebase will cause divergences from: 121d9e3bc4c6 (to force the rebase please set experimental.allowdivergence=True) diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -520,15 +520,15 @@ $ hg log -r 'obsolete()' 4:94b33453f93b (draft *obsolete*) [ ] add original_d $ hg summary - parent: 5:cda648ca50f5 tip (unstable) + parent: 5:cda648ca50f5 tip (orphan) add original_e branch: default commit: (clean) update: 1 new changesets, 2 branch heads (merge) phases: 3 draft - unstable: 1 changesets + orphan: 1 changesets $ 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 | @@ -552,7 +552,7 @@ $ hg push ../tmpc/ pushing to ../tmpc/ searching for changes - abort: push includes unstable changeset: cda648ca50f5! + abort: push includes orphan changeset: cda648ca50f5! [255] Test that extinct changeset are properly detected @@ -570,7 +570,7 @@ 2:245bde4270cd (public) [ ] add original_c 3:6f9641995072 (draft) [ ] add n3w_3_c 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 pushing to ../tmpf searching for changes @@ -591,7 +591,7 @@ Do not warn about new head when the new head is a successors of a remote one $ 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 | @@ -914,7 +914,7 @@ changeset: 7:50c51b361e60 user:test date:Thu Jan 01 00:00:00 1970 + - trouble: unstable, bumped + instability: orphan, bumped summary: add babar @@ -926,15 +926,15 @@ test the "troubles" templatekw $ 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 $ hg log -T default -r 'bumped()' changeset: 7:50c51b361e60 user:test date:Thu Jan 01 00:00:00 1970 + - trouble: unstable, bumped + trouble: orphan, bumped summary: add babar $ hg log -T default -r 'obsolete()' @@ -950,13 +950,13 @@ $ hg up -r 'bumped() and unstable()' 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg summary - parent: 7:50c51b361e60 (unstable, bumped) + parent: 7:50c51b361e60 (orphan, bumped) add babar branch: default commit: (clean) update: 2 new changesets (update) phases: 4 draft - unstable: 2 changesets + orphan: 2 changesets bumped: 1 changesets $ hg up -r 'obsolete()' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -967,7 +967,7 @@ commit: (clean) update: 3 new changesets (update) phases: 4 draft - unstable: 2 changesets + orphan: 2 changesets bumped: 1 changesets Test incoming/outcoming with changesets obsoleted remotely, known locally diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t --- a/tests/test-obsmarker-template.t +++ b/tests/test-obsmarker-template.t @@ -1099,7 +1099,7 @@ | o changeset: 7:ba2ed02b0c9a | | user:test | | date:Thu Jan 01 00:00:00 1970 + - | | instability: unstable, divergent + | | instability: orphan, divergent | | summary: Add A,B,C | | | x changeset: 6:4a004186e638 diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t --- a/tests/test-commit-amend.t +++ b/tests/test-commit-amend.t @@ -610,7 +610,7 @@ parent: 11:3334b7925910 user:test date:
D214: evolution: rename unstable to orphan
lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION 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. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D214 AFFECTED FILES mercurial/commands.py mercurial/context.py mercurial/exchange.py tests/test-commit-amend.t tests/test-obsmarker-template.t tests/test-obsolete.t tests/test-rebase-obsolete.t CHANGE DETAILS diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -793,13 +793,13 @@ o 0:4a2df7238c3b A $ hg summary - parent: 15:73568ab6879d tip (unstable) + parent: 15:73568ab6879d tip (orphan) bar foo branch: default commit: (clean) update: 2 new changesets, 3 branch heads (merge) phases: 8 draft - unstable: 1 changesets + orphan: 1 changesets $ hg rebase -s 10 -d 12 abort: this rebase will cause divergences from: 121d9e3bc4c6 (to force the rebase please set experimental.allowdivergence=True) diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -520,15 +520,15 @@ $ hg log -r 'obsolete()' 4:94b33453f93b (draft *obsolete*) [ ] add original_d $ hg summary - parent: 5:cda648ca50f5 tip (unstable) + parent: 5:cda648ca50f5 tip (orphan) add original_e branch: default commit: (clean) update: 1 new changesets, 2 branch heads (merge) phases: 3 draft - unstable: 1 changesets + orphan: 1 changesets $ 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 | @@ -552,7 +552,7 @@ $ hg push ../tmpc/ pushing to ../tmpc/ searching for changes - abort: push includes unstable changeset: cda648ca50f5! + abort: push includes orphan changeset: cda648ca50f5! [255] Test that extinct changeset are properly detected @@ -570,7 +570,7 @@ 2:245bde4270cd (public) [ ] add original_c 3:6f9641995072 (draft) [ ] add n3w_3_c 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 pushing to ../tmpf searching for changes @@ -591,7 +591,7 @@ Do not warn about new head when the new head is a successors of a remote one $ 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 | @@ -914,7 +914,7 @@ changeset: 7:50c51b361e60 user:test date:Thu Jan 01 00:00:00 1970 + - trouble: unstable, bumped + instability: orphan, bumped summary: add babar @@ -926,15 +926,15 @@ test the "troubles" templatekw $ 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 $ hg log -T default -r 'bumped()' changeset: 7:50c51b361e60 user:test date:Thu Jan 01 00:00:00 1970 + - trouble: unstable, bumped + trouble: orphan, bumped summary: add babar $ hg log -T default -r 'obsolete()' @@ -950,13 +950,13 @@ $ hg up -r 'bumped() and unstable()' 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg summary - parent: 7:50c51b361e60 (unstable, bumped) + parent: 7:50c51b361e60 (orphan, bumped) add babar branch: default commit: (clean) update: 2 new changesets (update) phases: 4 draft - unstable: 2 changesets + orphan: 2 changesets bumped: 1 changesets $ hg up -r 'obsolete()' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -967,7 +967,7 @@ commit: (clean) update: 3 new changesets (update) phases: 4 draft - unstable: 2 changesets + orphan: 2 changesets bumped: 1 changesets Test incoming/outcoming with changesets obsoleted remotely, known locally diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t --- a/tests/test-obsmarker-template.t +++ b/tests/test-obsmarker-template.t @@ -1099,7 +1099,7 @@ | o changeset: 7:ba2ed02b0c9a | | user:test | | date:Thu Jan 01 00:00:00 1970 + - | | instability: unstable, divergent + | | instability: orphan, divergent | | summary: Add A,B,C | | | x changeset: 6:4a004186e638 diff --git a/tests/test-commi