# HG changeset patch # User Boris Feld # Date 1528159825 -7200 # Node ID d0abd7949ea31dbc7f12f399125be884b4310044 # Parent 1e9c357d3ddfafbd0084744a6fe842901d3fbd9b phases: use "published" in the phase movement message Using "published" seems smoother than "became public" and more in line with the "phase.publishing" configuration. diff -r 1e9c357d3ddf -r d0abd7949ea3 mercurial/scmutil.py --- a/mercurial/scmutil.py Tue Jun 05 01:49:52 2018 +0200 +++ b/mercurial/scmutil.py Tue Jun 05 02:50:25 2018 +0200 @@ -1497,7 +1497,7 @@ ] if not published: return - repo.ui.status(_('%d local changesets became public\n') + repo.ui.status(_('%d local changesets published\n') % len(published)) def nodesummaries(repo, nodes, maxnumnodes=4): diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-bundle-r.t --- a/tests/test-bundle-r.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-bundle-r.t Tue Jun 05 02:50:25 2018 +0200 @@ -156,7 +156,7 @@ adding file changes added 4 changesets with 2 changes to 3 files (+1 heads) new changesets c70afb1ee985:faa2e4234c7a - 1 local changesets became public + 1 local changesets published (run 'hg heads' to see heads, 'hg merge' to merge) $ hg verify checking changesets diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-bundle2-exchange.t --- a/tests/test-bundle2-exchange.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-bundle2-exchange.t Tue Jun 05 02:50:25 2018 +0200 @@ -150,7 +150,7 @@ pulling from $TESTTMP/main no changes found pre-close-tip:24b6387c8c8c public - 1 local changesets became public + 1 local changesets published postclose-tip:24b6387c8c8c public txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=0 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-clonebundles.t --- a/tests/test-clonebundles.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-clonebundles.t Tue Jun 05 02:50:25 2018 +0200 @@ -129,7 +129,7 @@ adding file changes added 1 changesets with 1 changes to 1 files new changesets aaff8d2ffbbf - 1 local changesets became public + 1 local changesets published Incremental pull doesn't fetch bundle @@ -202,7 +202,7 @@ finished applying clone bundle searching for changes no changes found - 2 local changesets became public + 2 local changesets published Feature works over SSH @@ -215,7 +215,7 @@ finished applying clone bundle searching for changes no changes found - 2 local changesets became public + 2 local changesets published Entry with unknown BUNDLESPEC is filtered and not used @@ -235,7 +235,7 @@ finished applying clone bundle searching for changes no changes found - 2 local changesets became public + 2 local changesets published Automatic fallback when all entries are filtered @@ -273,7 +273,7 @@ finished applying clone bundle searching for changes no changes found - 2 local changesets became public + 2 local changesets published #else Python <2.7.9 will filter SNI URLs @@ -378,7 +378,7 @@ finished applying clone bundle searching for changes no changes found - 2 local changesets became public + 2 local changesets published Preferring bz2 type will download first entry of that type @@ -391,7 +391,7 @@ finished applying clone bundle searching for changes no changes found - 2 local changesets became public + 2 local changesets published Preferring multiple values of an option works @@ -404,7 +404,7 @@ finished applying clone bundle searching for changes no changes found - 2 local changesets became public + 2 local changesets published Sorting multiple values should get us back to original first entry @@ -417,7 +417,7 @@ finished applying clone bundle searching for changes no changes found - 2 local changesets became public + 2 local changesets published Preferring multiple attributes has correct order @@ -430,7 +430,7 @@ finished applying clone bundle searching for changes no changes found - 2 local changesets became public + 2 local changesets published Test where attribute is missing from some entries @@ -450,7 +450,7 @@ finished applying clone bundle searching for changes no changes found - 2 local changesets became public + 2 local changesets published Test interaction between clone bundles and --stream @@ -556,4 +556,4 @@ finished applying clone bundle searching for changes no changes found - 2 local changesets became public + 2 local changesets published diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-convert.t --- a/tests/test-convert.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-convert.t Tue Jun 05 02:50:25 2018 +0200 @@ -419,7 +419,7 @@ pulling from ../a searching for changes no changes found - 5 local changesets became public + 5 local changesets published conversion to existing file should fail diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-flags.t --- a/tests/test-flags.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-flags.t Tue Jun 05 02:50:25 2018 +0200 @@ -46,7 +46,7 @@ adding file changes added 1 changesets with 0 changes to 0 files (+1 heads) new changesets 7f4313b42a34 - 1 local changesets became public + 1 local changesets published (run 'hg heads' to see heads, 'hg merge' to merge) $ hg heads changeset: 2:7f4313b42a34 diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-merge6.t --- a/tests/test-merge6.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-merge6.t Tue Jun 05 02:50:25 2018 +0200 @@ -42,7 +42,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets b90e70beeb58 - 1 local changesets became public + 1 local changesets published (run 'hg heads' to see heads, 'hg merge' to merge) $ hg merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-obsolete-checkheads.t --- a/tests/test-obsolete-checkheads.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-obsolete-checkheads.t Tue Jun 05 02:50:25 2018 +0200 @@ -80,7 +80,7 @@ pulling from $TESTTMP/remote searching for changes no changes found - 1 local changesets became public + 1 local changesets published $ hg log -G --hidden @ 71e3228bffe1 (draft) add new | diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-phases-exchange.t --- a/tests/test-phases-exchange.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-phases-exchange.t Tue Jun 05 02:50:25 2018 +0200 @@ -167,7 +167,7 @@ pulling from ../alpha searching for changes no changes found - 1 local changesets became public + 1 local changesets published test-debug-phase: move rev 2: 1 -> 0 $ hgph o 4 public a-D - b555f63b6063 @@ -284,7 +284,7 @@ adding file changes added 1 changesets with 1 changes to 1 files new changesets b555f63b6063 - 3 local changesets became public + 3 local changesets published test-debug-phase: move rev 0: 1 -> 0 test-debug-phase: move rev 1: 1 -> 0 test-debug-phase: move rev 2: 1 -> 0 @@ -333,7 +333,7 @@ adding file changes added 2 changesets with 2 changes to 2 files new changesets d6bcb4f74035:145e75495359 - 4 local changesets became public + 4 local changesets published test-debug-phase: move rev 0: 1 -> 0 test-debug-phase: move rev 1: 1 -> 0 test-debug-phase: move rev 3: 1 -> 0 @@ -407,7 +407,7 @@ pulling from ../alpha searching for changes no changes found - 3 local changesets became public + 3 local changesets published test-debug-phase: move rev 3: 1 -> 0 test-debug-phase: move rev 5: 1 -> 0 test-debug-phase: move rev 6: 1 -> 0 diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-pull-branch.t --- a/tests/test-pull-branch.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-pull-branch.t Tue Jun 05 02:50:25 2018 +0200 @@ -170,7 +170,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets 7d8ffa4c0b22 - 13 local changesets became public + 13 local changesets published (run 'hg heads' to see heads) Make changes on default and branchC on tt @@ -184,7 +184,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets 2b94b54b6b5f - 1 local changesets became public + 1 local changesets published (run 'hg heads' to see heads) $ hg up -C default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -221,7 +221,7 @@ adding file changes added 2 changesets with 2 changes to 2 files (+2 heads) new changesets eed40c14b407:e634733b0309 - 1 local changesets became public + 1 local changesets published (run 'hg heads .' to see heads, 'hg merge' to merge) $ cd .. diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-pull-update.t --- a/tests/test-pull-update.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-pull-update.t Tue Jun 05 02:50:25 2018 +0200 @@ -27,7 +27,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets 107cefe13e42 - 1 local changesets became public + 1 local changesets published abort: uncommitted changes [255] $ hg --config extensions.strip= strip --no-backup tip @@ -59,7 +59,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets 800c91d5bfc1 - 1 local changesets became public + 1 local changesets published 0 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to "107cefe13e42: m" 1 other heads for branch "default" @@ -82,7 +82,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (-1 heads) new changesets 483b76ad4309 - 1 local changesets became public + 1 local changesets published 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Similarity between "hg update" and "hg pull -u" in handling bookmark @@ -111,7 +111,7 @@ added 1 changesets with 1 changes to 1 files adding remote bookmark active-after-pull new changesets f815b3da6163 - 1 local changesets became public + 1 local changesets published 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (activating bookmark active-after-pull) @@ -141,7 +141,7 @@ added 1 changesets with 1 changes to 1 files adding remote bookmark active-after-pull new changesets f815b3da6163 - 1 local changesets became public + 1 local changesets published 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (activating bookmark active-after-pull) @@ -180,7 +180,7 @@ adding file changes added 2 changesets with 1 changes to 1 files new changesets f815b3da6163:b5e4babfaaa7 - 1 local changesets became public + 1 local changesets published 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark active-before-pull) @@ -208,7 +208,7 @@ adding file changes added 2 changesets with 1 changes to 1 files new changesets f815b3da6163:b5e4babfaaa7 - 1 local changesets became public + 1 local changesets published 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark active-before-pull) @@ -236,7 +236,7 @@ adding file changes added 2 changesets with 1 changes to 1 files new changesets f815b3da6163:b5e4babfaaa7 - 1 local changesets became public + 1 local changesets published 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark active-before-pull) diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-rename-after-merge.t --- a/tests/test-rename-after-merge.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-rename-after-merge.t Tue Jun 05 02:50:25 2018 +0200 @@ -36,7 +36,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets d2ae7f538514 - 1 local changesets became public + 1 local changesets published (run 'hg heads' to see heads, 'hg merge' to merge) $ hg merge diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-rename-dir-merge.t --- a/tests/test-rename-dir-merge.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-rename-dir-merge.t Tue Jun 05 02:50:25 2018 +0200 @@ -219,7 +219,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets 7d51ed18da25 - 1 local changesets became public + 1 local changesets published (run 'hg heads' to see heads, 'hg merge' to merge) $ hg merge diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-share.t --- a/tests/test-share.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-share.t Tue Jun 05 02:50:25 2018 +0200 @@ -360,7 +360,7 @@ searching for changes no changes found adding remote bookmark bm3 - 1 local changesets became public + 1 local changesets published $ hg boo bm1 3:b87954705719 * bm3 4:62f4ded848e4 diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-simple-update.t --- a/tests/test-simple-update.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-simple-update.t Tue Jun 05 02:50:25 2018 +0200 @@ -31,7 +31,7 @@ adding file changes added 1 changesets with 1 changes to 1 files new changesets 30aff43faee1 - 1 local changesets became public + 1 local changesets published (run 'hg update' to get a working copy) $ hg verify diff -r 1e9c357d3ddf -r d0abd7949ea3 tests/test-treediscovery-legacy.t --- a/tests/test-treediscovery-legacy.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-treediscovery-legacy.t Tue Jun 05 02:50:25 2018 +0200 @@ -354,7 +354,7 @@ pulling from http://localhost:$HGPORT/ searching for changes no changes found - 1 local changesets became public + 1 local changesets published $ hg push $remote pushing to http://localhost:$HGPORT/ searching for changes