Mercurial > hg

changeset 38249:1e9c357d3ddf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
phase: clarify the message about movement on command changeset The current message is a bit generic. Since we only print it for phase movement on changeset already common before the pull, we add "local" to the message in and attempt to clarify what changeset the phase movement affected.
author Boris Feld <boris.feld@octobus.net>
date Tue, 05 Jun 2018 01:49:52 +0200
parents 99ab72b867b7
children d0abd7949ea3
files mercurial/scmutil.py tests/test-bundle-r.t tests/test-bundle2-exchange.t tests/test-clonebundles.t tests/test-convert.t tests/test-flags.t tests/test-merge6.t tests/test-obsolete-checkheads.t tests/test-phases-exchange.t tests/test-pull-branch.t tests/test-pull-update.t tests/test-rename-after-merge.t tests/test-rename-dir-merge.t tests/test-share.t tests/test-simple-update.t tests/test-treediscovery-legacy.t
diffstat 16 files changed, 39 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/scmutil.py	Sun Apr 29 00:29:40 2018 -0400
+++ b/mercurial/scmutil.py	Tue Jun 05 01:49:52 2018 +0200
@@ -1497,7 +1497,7 @@
             ]
             if not published:
                 return
-            repo.ui.status(_('%d changesets became public\n')
+            repo.ui.status(_('%d local changesets became public\n')
                            % len(published))
 
 def nodesummaries(repo, nodes, maxnumnodes=4):
--- a/tests/test-bundle-r.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-bundle-r.t	Tue Jun 05 01:49:52 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 changesets became public
+  1 local changesets became public
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg verify
   checking changesets
--- a/tests/test-bundle2-exchange.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-bundle2-exchange.t	Tue Jun 05 01:49:52 2018 +0200
@@ -150,7 +150,7 @@
   pulling from $TESTTMP/main
   no changes found
   pre-close-tip:24b6387c8c8c public 
-  1 changesets became public
+  1 local changesets became public
   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)
--- a/tests/test-clonebundles.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-clonebundles.t	Tue Jun 05 01:49:52 2018 +0200
@@ -129,7 +129,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets aaff8d2ffbbf
-  1 changesets became public
+  1 local changesets became public
 
 Incremental pull doesn't fetch bundle
 
@@ -202,7 +202,7 @@
   finished applying clone bundle
   searching for changes
   no changes found
-  2 changesets became public
+  2 local changesets became public
 
 Feature works over SSH
 
@@ -215,7 +215,7 @@
   finished applying clone bundle
   searching for changes
   no changes found
-  2 changesets became public
+  2 local changesets became public
 
 Entry with unknown BUNDLESPEC is filtered and not used
 
@@ -235,7 +235,7 @@
   finished applying clone bundle
   searching for changes
   no changes found
-  2 changesets became public
+  2 local changesets became public
 
 Automatic fallback when all entries are filtered
 
@@ -273,7 +273,7 @@
   finished applying clone bundle
   searching for changes
   no changes found
-  2 changesets became public
+  2 local changesets became public
 #else
 Python <2.7.9 will filter SNI URLs
 
@@ -378,7 +378,7 @@
   finished applying clone bundle
   searching for changes
   no changes found
-  2 changesets became public
+  2 local changesets became public
 
 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 changesets became public
+  2 local changesets became public
 
 Preferring multiple values of an option works
 
@@ -404,7 +404,7 @@
   finished applying clone bundle
   searching for changes
   no changes found
-  2 changesets became public
+  2 local changesets became public
 
 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 changesets became public
+  2 local changesets became public
 
 Preferring multiple attributes has correct order
 
@@ -430,7 +430,7 @@
   finished applying clone bundle
   searching for changes
   no changes found
-  2 changesets became public
+  2 local changesets became public
 
 Test where attribute is missing from some entries
 
@@ -450,7 +450,7 @@
   finished applying clone bundle
   searching for changes
   no changes found
-  2 changesets became public
+  2 local changesets became public
 
 Test interaction between clone bundles and --stream
 
@@ -556,4 +556,4 @@
   finished applying clone bundle
   searching for changes
   no changes found
-  2 changesets became public
+  2 local changesets became public
--- a/tests/test-convert.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-convert.t	Tue Jun 05 01:49:52 2018 +0200
@@ -419,7 +419,7 @@
   pulling from ../a
   searching for changes
   no changes found
-  5 changesets became public
+  5 local changesets became public
 
 conversion to existing file should fail
 
--- a/tests/test-flags.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-flags.t	Tue Jun 05 01:49:52 2018 +0200
@@ -46,7 +46,7 @@
   adding file changes
   added 1 changesets with 0 changes to 0 files (+1 heads)
   new changesets 7f4313b42a34
-  1 changesets became public
+  1 local changesets became public
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg heads
   changeset:   2:7f4313b42a34
--- a/tests/test-merge6.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-merge6.t	Tue Jun 05 01:49:52 2018 +0200
@@ -42,7 +42,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets b90e70beeb58
-  1 changesets became public
+  1 local changesets became public
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-obsolete-checkheads.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-obsolete-checkheads.t	Tue Jun 05 01:49:52 2018 +0200
@@ -80,7 +80,7 @@
   pulling from $TESTTMP/remote
   searching for changes
   no changes found
-  1 changesets became public
+  1 local changesets became public
   $ hg log -G --hidden
   @  71e3228bffe1 (draft) add new
   |
--- a/tests/test-phases-exchange.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-phases-exchange.t	Tue Jun 05 01:49:52 2018 +0200
@@ -167,7 +167,7 @@
   pulling from ../alpha
   searching for changes
   no changes found
-  1 changesets became public
+  1 local changesets became public
   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 changesets became public
+  3 local changesets became public
   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 changesets became public
+  4 local changesets became public
   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 changesets became public
+  3 local changesets became public
   test-debug-phase: move rev 3: 1 -> 0
   test-debug-phase: move rev 5: 1 -> 0
   test-debug-phase: move rev 6: 1 -> 0
--- a/tests/test-pull-branch.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-pull-branch.t	Tue Jun 05 01:49:52 2018 +0200
@@ -170,7 +170,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets 7d8ffa4c0b22
-  13 changesets became public
+  13 local changesets became public
   (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 changesets became public
+  1 local changesets became public
   (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 changesets became public
+  1 local changesets became public
   (run 'hg heads .' to see heads, 'hg merge' to merge)
 
   $ cd ..
--- a/tests/test-pull-update.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-pull-update.t	Tue Jun 05 01:49:52 2018 +0200
@@ -27,7 +27,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets 107cefe13e42
-  1 changesets became public
+  1 local changesets became public
   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 changesets became public
+  1 local changesets became public
   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 changesets became public
+  1 local changesets became public
   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 changesets became public
+  1 local changesets became public
   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 changesets became public
+  1 local changesets became public
   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 changesets became public
+  1 local changesets became public
   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 changesets became public
+  1 local changesets became public
   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 changesets became public
+  1 local changesets became public
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (leaving bookmark active-before-pull)
 
--- a/tests/test-rename-after-merge.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-rename-after-merge.t	Tue Jun 05 01:49:52 2018 +0200
@@ -36,7 +36,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets d2ae7f538514
-  1 changesets became public
+  1 local changesets became public
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg merge
--- a/tests/test-rename-dir-merge.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-rename-dir-merge.t	Tue Jun 05 01:49:52 2018 +0200
@@ -219,7 +219,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets 7d51ed18da25
-  1 changesets became public
+  1 local changesets became public
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg merge
--- a/tests/test-share.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-share.t	Tue Jun 05 01:49:52 2018 +0200
@@ -360,7 +360,7 @@
   searching for changes
   no changes found
   adding remote bookmark bm3
-  1 changesets became public
+  1 local changesets became public
   $ hg boo
      bm1                       3:b87954705719
    * bm3                       4:62f4ded848e4
--- a/tests/test-simple-update.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-simple-update.t	Tue Jun 05 01:49:52 2018 +0200
@@ -31,7 +31,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 30aff43faee1
-  1 changesets became public
+  1 local changesets became public
   (run 'hg update' to get a working copy)
 
   $ hg verify
--- a/tests/test-treediscovery-legacy.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-treediscovery-legacy.t	Tue Jun 05 01:49:52 2018 +0200
@@ -354,7 +354,7 @@
   pulling from http://localhost:$HGPORT/
   searching for changes
   no changes found
-  1 changesets became public
+  1 local changesets became public
   $ hg push $remote
   pushing to http://localhost:$HGPORT/
   searching for changes