Mercurial > hg

changeset 39899:f9232b0310ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b5e12039e6e0
children a89dd6d01df0
files mercurial/scmutil.py tests/test-obsolete-bundle-strip.t tests/test-obsolete-changeset-exchange.t tests/test-obsolete-checkheads.t tests/test-obsolete-distributed.t tests/test-obsolete.t
diffstat 6 files changed, 33 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/scmutil.py	Thu Sep 27 17:00:00 2018 +0200
+++ b/mercurial/scmutil.py	Thu Sep 27 16:52:25 2018 +0200
@@ -1651,6 +1651,17 @@
                     raise error.ProgrammingError(errormsg)
                 repo.ui.status(msg)
 
+            # search new changesets directly pulled as obsolete
+            obsadded = unfi.revs('%d: and obsolete()', origrepolen)
+            cl = repo.changelog
+            extinctadded = [r for r in obsadded if r not in cl]
+            if extinctadded:
+                # They are not just obsolete, but obsolete and invisible
+                # we call them "extinct" internally but the terms have not been
+                # exposed to users.
+                msg = '(%d other changesets obsolete on arrival)\n'
+                repo.ui.status(msg % len(extinctadded))
+
         @reportsummary
         def reportphasechanges(repo, tr):
             """Report statistics of phase changes for changesets pre-existing
--- 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)
--- a/tests/test-obsolete-changeset-exchange.t	Thu Sep 27 17:00:00 2018 +0200
+++ b/tests/test-obsolete-changeset-exchange.t	Thu Sep 27 16:52:25 2018 +0200
@@ -85,6 +85,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 1 files (+1 heads)
+  (1 other changesets obsolete on arrival)
   (run 'hg heads' to see heads)
 
 check-that bundle can contain markers:
--- a/tests/test-obsolete-checkheads.t	Thu Sep 27 17:00:00 2018 +0200
+++ b/tests/test-obsolete-checkheads.t	Thu Sep 27 16:52:25 2018 +0200
@@ -277,6 +277,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+  (1 other changesets obsolete on arrival)
   (run 'hg heads' to see heads)
   $ hg push
   pushing to $TESTTMP/remote
--- a/tests/test-obsolete-distributed.t	Thu Sep 27 17:00:00 2018 +0200
+++ b/tests/test-obsolete-distributed.t	Thu Sep 27 16:52:25 2018 +0200
@@ -411,6 +411,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 0 changes to 2 files (+1 heads)
+  (2 other changesets obsolete on arrival)
   (run 'hg heads' to see heads)
   $ hg log -G
   o  4:77ae25d99ff0 c_B2
@@ -455,6 +456,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 0 changes to 2 files (+1 heads)
+  (2 other changesets obsolete on arrival)
   (run 'hg heads' to see heads)
   $ hg log -G
   o  4:77ae25d99ff0 c_B2
--- a/tests/test-obsolete.t	Thu Sep 27 17:00:00 2018 +0200
+++ b/tests/test-obsolete.t	Thu Sep 27 16:52:25 2018 +0200
@@ -1602,6 +1602,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  (1 other changesets obsolete on arrival)
   (run 'hg update' to get a working copy)
   $ hg log -G
   @  7:7ae79c5d60f0 (draft) [tip ] dd