Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
streamclone: abort when client needs to handle obsmarkers, but doesn't
authorAnton Shestakov <av6@dwimlabs.net>
Fri, 05 Oct 2018 23:40:12 +0800
changeset 40399 4ab6e7b4fe8a
parent 40398 0ac794e0e285
child 40400 db0dba2d157d
streamclone: abort when client needs to handle obsmarkers, but doesn't When client doesn't have any of obsolescence markers exchange capabilities, then it's safe to say it can't handle obsmarkers. However, if it understands even one format version, then stream clones are fine -- client can use "obsmarkers" bundle2 part.
mercurial/bundle2.py file | annotate | diff | comparison | revisions
tests/test-clone-uncompressed.t file | annotate | diff | comparison | revisions 
--- a/mercurial/bundle2.py	Fri Oct 05 23:27:17 2018 +0800
+++ b/mercurial/bundle2.py	Fri Oct 05 23:40:12 2018 +0800
@@ -1700,7 +1700,10 @@
     includeobsmarkers = False
     if repo.obsstore:
         remoteversions = obsmarkersversion(bundler.capabilities)
-        if repo.obsstore._version in remoteversions:
+        if not remoteversions:
+            raise error.Abort(_('server has obsolescence markers, but client '
+                                'cannot receive them via stream clone'))
+        elif repo.obsstore._version in remoteversions:
             includeobsmarkers = True
 
     filecount, bytecount, it = streamclone.generatev2(repo, includepats,
--- a/tests/test-clone-uncompressed.t	Fri Oct 05 23:27:17 2018 +0800
+++ b/tests/test-clone-uncompressed.t	Fri Oct 05 23:40:12 2018 +0800
@@ -556,6 +556,12 @@
   $ hg debugobsolete -R with-obsolescence
   50382b884f66690b7045cac93a540cba4d4c906f 0 {c17445101a72edac06facd130d14808dfbd5c7c2} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
+  $ hg clone -U --stream --config experimental.evolution=0 http://localhost:$HGPORT with-obsolescence-no-evolution
+  streaming all changes
+  remote: abort: server has obsolescence markers, but client cannot receive them via stream clone
+  abort: pull failed on remote
+  [255]
+
   $ killdaemons.py
 
 #endif
mercurial