Mercurial > evolve

changeset 1037:bddee73b361e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: add "absolescence" in front of markers in the message
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 08 Aug 2014 17:34:22 -0700
parents 70de12b7721a
children 45c4739e85dc
files hgext/evolve.py tests/test-corrupt.t tests/test-exchange-A1.t tests/test-exchange-A2.t tests/test-exchange-A3.t tests/test-exchange-A4.t tests/test-exchange-A5.t tests/test-exchange-A6.t tests/test-exchange-B1.t tests/test-exchange-B2.t tests/test-exchange-B4.t tests/test-exchange-B5.t tests/test-exchange-B6.t tests/test-exchange-C1.t tests/test-exchange-C2.t tests/test-exchange-C3.t tests/test-exchange-C4.t tests/test-exchange-D1.t tests/test-exchange-D2.t tests/test-exchange-D4.t tests/test-obsolete.t tests/test-sharing.t tests/test-simple4server.t tests/test-tutorial.t tests/test-wireproto.t
diffstat 25 files changed, 45 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Fri Aug 08 17:29:29 2014 -0700
+++ b/hgext/evolve.py	Fri Aug 08 17:34:22 2014 -0700
@@ -2403,7 +2403,7 @@
             _encodemarkersstream(obsdata, markers)
             obsdata.seek(0)
             obsdata.ui = repo.ui
-            obsexcmsg(repo.ui, "pushing %i markers (%i bytes)\n"
+            obsexcmsg(repo.ui, "pushing %i obsolescence markers (%i bytes)\n"
                                % (len(markers), len(obsdata.getvalue())),
                       True)
             bundler.newpart('EVOLVE:B2X:OBSMARKERV1', data=obsdata)
@@ -2478,7 +2478,7 @@
             _encodemarkersstream(obsdata, markers)
             obsdata.seek(0)
             obsdata.ui = repo.ui
-            obsexcmsg(repo.ui, "pushing %i markers (%i bytes)\n"
+            obsexcmsg(repo.ui, "pushing %i obsolescence markers (%i bytes)\n"
                                % (len(markers), len(obsdata.getvalue())),
                       True)
             bundler = bundle2.bundle20(pushop.ui, {})
@@ -2501,7 +2501,7 @@
             _encodemarkersstream(obsdata, markers)
             obsdata.seek(0)
             obsdata.ui = repo.ui
-            obsexcmsg(repo.ui, "pushing %i markers (%i bytes)\n"
+            obsexcmsg(repo.ui, "pushing %i obsolescence markers (%i bytes)\n"
                                % (len(markers), len(obsdata.getvalue())),
                       True)
             remote.evoext_pushobsmarkers_0(obsdata)
@@ -2511,7 +2511,7 @@
             remotedata = _pushkeyescape(markers).items()
             totalbytes = sum(len(d) for k,d in remotedata)
             sentbytes = 0
-            obsexcmsg(repo.ui, "pushing %i markers in %i pushkey payload (%i bytes)\n"
+            obsexcmsg(repo.ui, "pushing %i obsolescence markers in %i pushkey payload (%i bytes)\n"
                                 % (len(markers), len(remotedata), totalbytes),
                       True)
             for key, data in remotedata:
--- a/tests/test-corrupt.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-corrupt.t	Fri Aug 08 17:34:22 2014 -0700
@@ -111,7 +111,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
-  pushing 2 markers (147 bytes)
+  pushing 2 obsolescence markers (147 bytes)
   $ hg -R ../other verify
   checking changesets
   checking manifests
--- a/tests/test-exchange-A1.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-A1.t	Fri Aug 08 17:34:22 2014 -0700
@@ -74,7 +74,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -124,7 +124,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -233,7 +233,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -280,7 +280,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-A2.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-A2.t	Fri Aug 08 17:34:22 2014 -0700
@@ -82,7 +82,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-A3.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-A3.t	Fri Aug 08 17:34:22 2014 -0700
@@ -94,7 +94,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -198,7 +198,7 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-A4.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-A4.t	Fri Aug 08 17:34:22 2014 -0700
@@ -87,7 +87,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-A5.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-A5.t	Fri Aug 08 17:34:22 2014 -0700
@@ -94,7 +94,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-A6.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-A6.t	Fri Aug 08 17:34:22 2014 -0700
@@ -82,7 +82,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -121,7 +121,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-B1.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-B1.t	Fri Aug 08 17:34:22 2014 -0700
@@ -73,7 +73,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers (89 bytes)
+  OBSEXC: pushing 1 obsolescence markers (89 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -120,7 +120,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers (89 bytes)
+  OBSEXC: pushing 1 obsolescence markers (89 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-B2.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-B2.t	Fri Aug 08 17:34:22 2014 -0700
@@ -65,7 +65,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 1 markers (89 bytes)
+  OBSEXC: pushing 1 obsolescence markers (89 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -104,7 +104,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 1 markers (89 bytes)
+  OBSEXC: pushing 1 obsolescence markers (89 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-B4.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-B4.t	Fri Aug 08 17:34:22 2014 -0700
@@ -91,7 +91,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 1 markers (89 bytes)
+  OBSEXC: pushing 1 obsolescence markers (89 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -130,7 +130,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 1 markers (89 bytes)
+  OBSEXC: pushing 1 obsolescence markers (89 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-B5.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-B5.t	Fri Aug 08 17:34:22 2014 -0700
@@ -93,7 +93,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 2 markers (150 bytes)
+  OBSEXC: pushing 2 obsolescence markers (150 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -148,7 +148,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 2 markers (150 bytes)
+  OBSEXC: pushing 2 obsolescence markers (150 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-B6.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-B6.t	Fri Aug 08 17:34:22 2014 -0700
@@ -77,7 +77,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 2 markers (150 bytes)
+  OBSEXC: pushing 2 obsolescence markers (150 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-C1.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-C1.t	Fri Aug 08 17:34:22 2014 -0700
@@ -72,7 +72,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 2 markers (177 bytes)
+  OBSEXC: pushing 2 obsolescence markers (177 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -117,7 +117,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 2 markers (177 bytes)
+  OBSEXC: pushing 2 obsolescence markers (177 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-C2.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-C2.t	Fri Aug 08 17:34:22 2014 -0700
@@ -82,7 +82,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 2 markers (150 bytes)
+  OBSEXC: pushing 2 obsolescence markers (150 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -135,7 +135,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 2 markers (150 bytes)
+  OBSEXC: pushing 2 obsolescence markers (150 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-C3.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-C3.t	Fri Aug 08 17:34:22 2014 -0700
@@ -85,7 +85,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 3 markers (238 bytes)
+  OBSEXC: pushing 3 obsolescence markers (238 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -136,7 +136,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 3 markers (238 bytes)
+  OBSEXC: pushing 3 obsolescence markers (238 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-C4.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-C4.t	Fri Aug 08 17:34:22 2014 -0700
@@ -92,7 +92,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 2 markers (150 bytes)
+  OBSEXC: pushing 2 obsolescence markers (150 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-D1.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-D1.t	Fri Aug 08 17:34:22 2014 -0700
@@ -76,7 +76,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 2 markers (150 bytes)
+  OBSEXC: pushing 2 obsolescence markers (150 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-D2.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-D2.t	Fri Aug 08 17:34:22 2014 -0700
@@ -69,7 +69,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 2 markers (150 bytes)
+  OBSEXC: pushing 2 obsolescence markers (150 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-exchange-D4.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-exchange-D4.t	Fri Aug 08 17:34:22 2014 -0700
@@ -91,7 +91,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 2 markers (123 bytes)
+  OBSEXC: pushing 2 obsolescence markers (123 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
--- a/tests/test-obsolete.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-obsolete.t	Fri Aug 08 17:34:22 2014 -0700
@@ -181,7 +181,7 @@
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
-  pushing 2 markers (123 bytes)
+  pushing 2 obsolescence markers (123 bytes)
   $ hg -R ../other-new verify
   checking changesets
   checking manifests
@@ -235,7 +235,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 3 markers (184 bytes)
+  pushing 3 obsolescence markers (184 bytes)
   $ qlog -R ../other-new
   5
   - 95de7fc6918d
@@ -257,7 +257,7 @@
   pushing to ../other-new
   searching for changes
   no changes found
-  pushing 3 markers (184 bytes)
+  pushing 3 obsolescence markers (184 bytes)
   [1]
 
   $ hg up --hidden -q .^ # 3
@@ -532,7 +532,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to [12] files (re)
-  pushing 7 markers (452 bytes)
+  pushing 7 obsolescence markers (452 bytes)
   $ hg up -q 10
   $ mkcommit "obsol_d'''"
   created new head
@@ -544,7 +544,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 8 markers (513 bytes)
+  pushing 8 obsolescence markers (513 bytes)
   $ cd ..
 
 check bumped detection
--- a/tests/test-sharing.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-sharing.t	Fri Aug 08 17:34:22 2014 -0700
@@ -112,7 +112,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pushing 4 markers (341 bytes)
+  pushing 4 obsolescence markers (341 bytes)
 
 Figure SG05
   $ hg -R ../public shortlog -G
--- a/tests/test-simple4server.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-simple4server.t	Fri Aug 08 17:34:22 2014 -0700
@@ -90,7 +90,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 2 markers (171 bytes)
+  pushing 2 obsolescence markers (171 bytes)
   $ hg push
   pushing to http://localhost:$HGPORT/
   searching for changes
--- a/tests/test-tutorial.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-tutorial.t	Fri Aug 08 17:34:22 2014 -0700
@@ -402,7 +402,7 @@
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
-  pushing 6 markers (487 bytes)
+  pushing 6 obsolescence markers (487 bytes)
 
 for simplicity sake we get the bathroom change in line again
 
@@ -723,7 +723,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files (+1 heads)
-  pushing 10 markers (803 bytes)
+  pushing 10 obsolescence markers (803 bytes)
 
 remote get a warning that current working directory is based on an obsolete changeset
 
--- a/tests/test-wireproto.t	Fri Aug 08 17:29:29 2014 -0700
+++ b/tests/test-wireproto.t	Fri Aug 08 17:34:22 2014 -0700
@@ -66,7 +66,7 @@
   $ hg push
   pushing to ssh://user@dummy/server
   searching for changes
-  pushing 2 markers (171 bytes)
+  pushing 2 obsolescence markers (171 bytes)
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes