Mercurial > hg
comparison tests/test-rebase-conflicts.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.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 08 Sep 2019 09:42:53 +0200 |
parents | c7d236b55a3e |
children | 181ee2118a96 |
comparison
equal
deleted
inserted
replaced
42896:7e19b640c53e | 42897:d7304434390f |
---|---|
313 add changeset 19c888675e13 | 313 add changeset 19c888675e13 |
314 add changeset 2a7f09cac94c | 314 add changeset 2a7f09cac94c |
315 adding manifests | 315 adding manifests |
316 adding file changes | 316 adding file changes |
317 adding f1.txt revisions | 317 adding f1.txt revisions |
318 added 2 changesets with 2 changes to 1 files | |
319 bundle2-input-part: total payload size 1686 | 318 bundle2-input-part: total payload size 1686 |
320 bundle2-input-part: "cache:rev-branch-cache" (advisory) supported | 319 bundle2-input-part: "cache:rev-branch-cache" (advisory) supported |
321 bundle2-input-part: total payload size 74 | 320 bundle2-input-part: total payload size 74 |
322 truncating cache/rbc-revs-v1 to 56 | 321 truncating cache/rbc-revs-v1 to 56 |
323 bundle2-input-part: "phase-heads" supported | 322 bundle2-input-part: "phase-heads" supported |
324 bundle2-input-part: total payload size 24 | 323 bundle2-input-part: total payload size 24 |
325 bundle2-input-bundle: 2 parts total | 324 bundle2-input-bundle: 2 parts total |
325 added 2 changesets with 2 changes to 1 files | |
326 updating the branch cache | 326 updating the branch cache |
327 invalid branch cache (served): tip differs | 327 invalid branch cache (served): tip differs |
328 invalid branch cache (served.hidden): tip differs | 328 invalid branch cache (served.hidden): tip differs |
329 rebase completed | 329 rebase completed |
330 | 330 |