Mercurial > hg
diff tests/test-obsolete-bundle-strip.t @ 39899:f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Changeset pulled from a remote repository while already obsolete locally can
end up hidden after the pull. Hiding obsolete changesets is a good behavior
but silently "skipping" some of the pulled content can get confusing.
We now detect this situation and emit a message about it. The message is
simple and the wording could be improved, however, we focus on the detection
here. Evolution is still an experimental feature, so the output is open to
changes.
In particular, we could point out at the latest successors of the obsolete
changesets, however, it can get tricky is there are many of them. So we delay
these improvements to another adventure.
Another easy improvement would be to merge this message with the previous line
about the new nodes and their phases.
This is a good example of cases where we can only transmit a limited amount of
data to users by default. We need some sort of "transaction journal" we could
point the user to.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 27 Sep 2018 16:52:25 +0200 |
| parents | 89630d0b3e23 |
| children | 34a46d48d24e |
line wrap: on
line diff
--- a/tests/test-obsolete-bundle-strip.t Thu Sep 27 17:00:00 2018 +0200 +++ b/tests/test-obsolete-bundle-strip.t Thu Sep 27 16:52:25 2018 +0200 @@ -170,6 +170,7 @@ # unbundling: adding manifests # unbundling: adding file changes # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) + # unbundling: (1 other changesets obsolete on arrival) # unbundling: (run 'hg heads' to see heads) $ testrevs 'desc("C-A1")' @@ -248,6 +249,7 @@ # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) # unbundling: 3 new obsolescence markers # unbundling: new changesets cf2c22470d67 (1 drafts) + # unbundling: (1 other changesets obsolete on arrival) # unbundling: (run 'hg heads' to see heads) chain with prune children @@ -339,6 +341,7 @@ # unbundling: adding file changes # unbundling: added 1 changesets with 1 changes to 1 files # unbundling: 1 new obsolescence markers + # unbundling: (1 other changesets obsolete on arrival) # unbundling: (run 'hg update' to get a working copy) $ testrevs 'desc("C-A1")' @@ -437,6 +440,7 @@ # unbundling: added 3 changesets with 3 changes to 3 files (+1 heads) # unbundling: 3 new obsolescence markers # unbundling: new changesets cf2c22470d67 (1 drafts) + # unbundling: (2 other changesets obsolete on arrival) # unbundling: (run 'hg heads' to see heads) chain with precursors also pruned @@ -503,6 +507,7 @@ # unbundling: adding manifests # unbundling: adding file changes # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) + # unbundling: (1 other changesets obsolete on arrival) # unbundling: (run 'hg heads' to see heads) $ testrevs 'desc("C-A1")' @@ -578,6 +583,7 @@ # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) # unbundling: 3 new obsolescence markers # unbundling: new changesets cf2c22470d67 (1 drafts) + # unbundling: (1 other changesets obsolete on arrival) # unbundling: (run 'hg heads' to see heads) chain with missing prune @@ -836,6 +842,7 @@ # unbundling: adding manifests # unbundling: adding file changes # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) + # unbundling: (1 other changesets obsolete on arrival) # unbundling: (run 'hg heads' to see heads) $ testrevs 'desc("C-B")' @@ -864,6 +871,7 @@ # unbundling: adding manifests # unbundling: adding file changes # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) + # unbundling: (1 other changesets obsolete on arrival) # unbundling: (run 'hg heads' to see heads) $ testrevs 'desc("C-C")' @@ -892,6 +900,7 @@ # unbundling: adding manifests # unbundling: adding file changes # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) + # unbundling: (1 other changesets obsolete on arrival) # unbundling: (run 'hg heads' to see heads) $ testrevs 'desc("C-D")' @@ -920,6 +929,7 @@ # unbundling: adding manifests # unbundling: adding file changes # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) + # unbundling: (1 other changesets obsolete on arrival) # unbundling: (run 'hg heads' to see heads) $ testrevs 'desc("C-E")' @@ -1018,6 +1028,7 @@ # unbundling: adding manifests # unbundling: adding file changes # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) + # unbundling: (2 other changesets obsolete on arrival) # unbundling: (run 'hg heads' to see heads) * top one and other divergent @@ -1087,6 +1098,7 @@ # unbundling: 7 new obsolescence markers # unbundling: obsoleted 2 changesets # unbundling: new changesets 2f20ff6509f0 (1 drafts) + # unbundling: (1 other changesets obsolete on arrival) # unbundling: (run 'hg heads' to see heads) * top one and initial precursors @@ -1155,6 +1167,7 @@ # unbundling: 6 new obsolescence markers # unbundling: obsoleted 3 changesets # unbundling: new changesets 2f20ff6509f0 (1 drafts) + # unbundling: (1 other changesets obsolete on arrival) # unbundling: (run 'hg heads' to see heads) * top one and one of the split @@ -1224,6 +1237,7 @@ # unbundling: 7 new obsolescence markers # unbundling: obsoleted 2 changesets # unbundling: new changesets 2f20ff6509f0 (1 drafts) + # unbundling: (1 other changesets obsolete on arrival) # unbundling: (run 'hg heads' to see heads) * all @@ -1299,6 +1313,7 @@ # unbundling: added 5 changesets with 5 changes to 5 files (+4 heads) # unbundling: 9 new obsolescence markers # unbundling: new changesets 2f20ff6509f0 (1 drafts) + # unbundling: (4 other changesets obsolete on arrival) # unbundling: (run 'hg heads' to see heads) changeset pruned on its own @@ -1372,6 +1387,7 @@ # unbundling: adding file changes # unbundling: added 1 changesets with 1 changes to 1 files # unbundling: 1 new obsolescence markers + # unbundling: (1 other changesets obsolete on arrival) # unbundling: (run 'hg update' to get a working copy) $ testrevs 'desc("C-")' ### Matched revisions### @@ -1401,4 +1417,5 @@ # unbundling: added 2 changesets with 2 changes to 2 files # unbundling: 1 new obsolescence markers # unbundling: new changesets 9ac430e15fca (1 drafts) + # unbundling: (1 other changesets obsolete on arrival) # unbundling: (run 'hg update' to get a working copy)