diff tests/test-ssh-proto-unbundle.t @ 42897:d7304434390f

changegroup: move message about added changes to transaction summary

Before that, applying multiple changegroups in the same transaction issued the
message multiple time. This result in a confusing output:

    adding changesets
    adding manifests
    adding file changes
    added 32768 changesets with 60829 changes to 2668 files
    adding changesets
    adding manifests
    adding file changes
    added 8192 changesets with 16885 changes to 1553 files
    adding changesets
    adding manifests
    adding file changes
    added 1020 changesets with 1799 changes to 536 files
    adding changesets
    adding manifests
    ...

Instead, we now only issue the message once at the end of the transaction,
summing up all added changesets, changes and files. The line is identical, but
happens sightly later in the output.

There are other suboptimal behavior around issue multiple changegroup (eg:
progress bar). We'll cover them later.

This impact of lot of test as one would expect, but a two pass check show they
are just the order change we expected.

To deal with "under the hood" bundle application by internal code, we had to
take a slightly hacky move. We could clean that up with a more official way to
enter "under the hood" section, however I want to keep this series simple to get
it landed. This kind of change have a very high bit rot rate since it impact a
lot of test output.

--- a/tests/test-ssh-proto-unbundle.t	Sun Sep 08 01:02:34 2019 +0200
+++ b/tests/test-ssh-proto-unbundle.t	Sun Sep 08 09:42:53 2019 +0200
@@ -272,11 +272,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 196:
+  e> read(-1) -> 151:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     ui.write 1 line\n
   e>     transaction abort!\n
   e>     rollback completed\n
@@ -328,11 +327,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 196:
+  e> read(-1) -> 151:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     ui.write 1 line\n
   e>     transaction abort!\n
   e>     rollback completed\n
@@ -398,11 +396,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 218:
+  e> read(-1) -> 173:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     ui.write 2 lines 1\n
   e>     ui.write 2 lines 2\n
   e>     transaction abort!\n
@@ -455,11 +452,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 218:
+  e> read(-1) -> 173:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     ui.write 2 lines 1\n
   e>     ui.write 2 lines 2\n
   e>     transaction abort!\n
@@ -526,11 +522,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 202:
+  e> read(-1) -> 157:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     ui.write 1 line flush\n
   e>     transaction abort!\n
   e>     rollback completed\n
@@ -582,11 +577,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 202:
+  e> read(-1) -> 157:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     ui.write 1 line flush\n
   e>     transaction abort!\n
   e>     rollback completed\n
@@ -652,11 +646,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 206:
+  e> read(-1) -> 161:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     ui.write 1st\n
   e>     ui.write 2nd\n
   e>     transaction abort!\n
@@ -709,11 +702,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 206:
+  e> read(-1) -> 161:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     ui.write 1st\n
   e>     ui.write 2nd\n
   e>     transaction abort!\n
@@ -780,11 +772,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 232:
+  e> read(-1) -> 187:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     ui.write 1\n
   e>     ui.write_err 1\n
   e>     ui.write 2\n
@@ -839,11 +830,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 232:
+  e> read(-1) -> 187:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     ui.write 1\n
   e>     ui.write_err 1\n
   e>     ui.write 2\n
@@ -912,11 +902,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 193:
+  e> read(-1) -> 148:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     printed line\n
   e>     transaction abort!\n
   e>     rollback completed\n
@@ -968,11 +957,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 193:
+  e> read(-1) -> 148:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     printed line\n
   e>     transaction abort!\n
   e>     rollback completed\n
@@ -1038,11 +1026,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 218:
+  e> read(-1) -> 173:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     print 1\n
   e>     ui.write 1\n
   e>     print 2\n
@@ -1097,11 +1084,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 218:
+  e> read(-1) -> 173:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     print 1\n
   e>     ui.write 1\n
   e>     print 2\n
@@ -1170,11 +1156,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 216:
+  e> read(-1) -> 171:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     stdout 1\n
   e>     stderr 1\n
   e>     stdout 2\n
@@ -1229,11 +1214,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 216:
+  e> read(-1) -> 171:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     stdout 1\n
   e>     stderr 1\n
   e>     stdout 2\n
@@ -1308,11 +1292,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 212:
+  e> read(-1) -> 167:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     stdout 1\n
   e>     stdout 2\n
   e>     transaction abort!\n
@@ -1365,11 +1348,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 212:
+  e> read(-1) -> 167:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     stdout 1\n
   e>     stdout 2\n
   e>     transaction abort!\n
@@ -1437,11 +1419,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 212:
+  e> read(-1) -> 167:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     stderr 1\n
   e>     stderr 2\n
   e>     transaction abort!\n
@@ -1494,11 +1475,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 212:
+  e> read(-1) -> 167:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     stderr 1\n
   e>     stderr 2\n
   e>     transaction abort!\n
@@ -1568,11 +1548,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 230:
+  e> read(-1) -> 185:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     stdout 1\n
   e>     stderr 1\n
   e>     stdout 2\n
@@ -1627,11 +1606,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 230:
+  e> read(-1) -> 185:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     stdout 1\n
   e>     stderr 1\n
   e>     stdout 2\n
@@ -1709,11 +1687,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 273:
+  e> read(-1) -> 228:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     shell stdout 1\n
   e>     shell stderr 1\n
   e>     shell stdout 2\n
@@ -1772,11 +1749,10 @@
   o> read(1) -> 1: 0
   result: 0
   remote output: 
-  e> read(-1) -> 273:
+  e> read(-1) -> 228:
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     shell stdout 1\n
   e>     shell stderr 1\n
   e>     shell stdout 2\n
@@ -1983,11 +1959,11 @@
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     ui.write 1\n
   e>     ui.write_err 1\n
   e>     ui.write 2\n
   e>     ui.write_err 2\n
+  e>     added 1 changesets with 1 changes to 1 files\n
   
   testing ssh2
   creating ssh peer from handshake results
@@ -2039,8 +2015,8 @@
   e>     adding changesets\n
   e>     adding manifests\n
   e>     adding file changes\n
-  e>     added 1 changesets with 1 changes to 1 files\n
   e>     ui.write 1\n
   e>     ui.write_err 1\n
   e>     ui.write 2\n
   e>     ui.write_err 2\n
+  e>     added 1 changesets with 1 changes to 1 files\n