Patchwork [2,of,2] phases: use "published" in the phase movement message

login
register
mail settings
Submitter Boris Feld
Date June 8, 2018, 3:49 p.m.
Message ID <428f099e99fc9c07827d.1528472978@localhost.localdomain>
Download mbox | patch
Permalink /patch/32038/
State Accepted
Headers show

Comments

Boris Feld - June 8, 2018, 3:49 p.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1528159825 -7200
#      Tue Jun 05 02:50:25 2018 +0200
# Node ID 428f099e99fc9c07827d089ca614cdd7126a8e43
# Parent  252357ef292e4bfd043cd932c135b249f3a20741
# EXP-Topic phase-msg
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 428f099e99fc
phases: use "published" in the phase movement message

Using "published" seems smoother than "became public" and more in line with the
"phase.publishing" configuration.

Patch

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -1497,7 +1497,7 @@  def registersummarycallback(repo, otr, t
             ]
             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 --git a/tests/test-bundle-r.t b/tests/test-bundle-r.t
--- a/tests/test-bundle-r.t
+++ b/tests/test-bundle-r.t
@@ -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 --git a/tests/test-bundle2-exchange.t b/tests/test-bundle2-exchange.t
--- a/tests/test-bundle2-exchange.t
+++ b/tests/test-bundle2-exchange.t
@@ -150,7 +150,7 @@  pull empty (with phase movement)
   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 --git a/tests/test-clonebundles.t b/tests/test-clonebundles.t
--- a/tests/test-clonebundles.t
+++ b/tests/test-clonebundles.t
@@ -129,7 +129,7 @@  changes. If this output changes, we coul
   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 @@  by old clients.
   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 @@  Feature works over SSH
   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 @@  Entry with unknown BUNDLESPEC is filtere
   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 @@  Python 2.7.9+ support SNI
   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 @@  Preferring an undefined attribute will t
   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 @@  Preferring bz2 type will download first 
   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 @@  Preferring multiple values of an option 
   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 @@  Sorting multiple values should get us ba
   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 @@  Preferring multiple attributes has corre
   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 @@  Test where attribute is missing from som
   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 @@  Test clone bundle retrieved through bund
   finished applying clone bundle
   searching for changes
   no changes found
-  2 local changesets became public
+  2 local changesets published
diff --git a/tests/test-flags.t b/tests/test-flags.t
--- a/tests/test-flags.t
+++ b/tests/test-flags.t
@@ -46,7 +46,7 @@  the changelog should mention file a:
   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 --git a/tests/test-merge6.t b/tests/test-merge6.t
--- a/tests/test-merge6.t
+++ b/tests/test-merge6.t
@@ -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 --git a/tests/test-obsolete-checkheads.t b/tests/test-obsolete-checkheads.t
--- a/tests/test-obsolete-checkheads.t
+++ b/tests/test-obsolete-checkheads.t
@@ -80,7 +80,7 @@  setup
   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 --git a/tests/test-phases-exchange.t b/tests/test-phases-exchange.t
--- a/tests/test-phases-exchange.t
+++ b/tests/test-phases-exchange.t
@@ -167,7 +167,7 @@  update must update phase of common chang
   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 @@  we are in nu
   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 @@  pulling from Publish=False to publish=Fa
   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 back into original repo
   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 --git a/tests/test-pull-branch.t b/tests/test-pull-branch.t
--- a/tests/test-pull-branch.t
+++ b/tests/test-pull-branch.t
@@ -170,7 +170,7 @@  Pull branchC from tt
   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 @@  Make changes on default and branchC on t
   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 @@  Pull from tt
   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 --git a/tests/test-pull-update.t b/tests/test-pull-update.t
--- a/tests/test-pull-update.t
+++ b/tests/test-pull-update.t
@@ -27,7 +27,7 @@  Should respect config to disable dirty u
   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 @@  Should not update to the other branch:
   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 @@  Should work:
   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 @@  explicit destination of the update.
   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 @@  explicit destination of the update.
   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 @@  match with the name of any existing book
   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 @@  match with the name of any existing book
   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 @@  match with the name of any existing book
   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 --git a/tests/test-rename-after-merge.t b/tests/test-rename-after-merge.t
--- a/tests/test-rename-after-merge.t
+++ b/tests/test-rename-after-merge.t
@@ -36,7 +36,7 @@  Merge repositories:
   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 --git a/tests/test-rename-dir-merge.t b/tests/test-rename-dir-merge.t
--- a/tests/test-rename-dir-merge.t
+++ b/tests/test-rename-dir-merge.t
@@ -219,7 +219,7 @@  Second scenario with two repos:
   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 --git a/tests/test-share.t b/tests/test-share.t
--- a/tests/test-share.t
+++ b/tests/test-share.t
@@ -360,7 +360,7 @@  verify that bookmarks are not written on
   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 --git a/tests/test-simple-update.t b/tests/test-simple-update.t
--- a/tests/test-simple-update.t
+++ b/tests/test-simple-update.t
@@ -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 --git a/tests/test-treediscovery-legacy.t b/tests/test-treediscovery-legacy.t
--- a/tests/test-treediscovery-legacy.t
+++ b/tests/test-treediscovery-legacy.t
@@ -354,7 +354,7 @@  Exercise pushing to server without branc
   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