Patchwork D1957: streamclonebundle: make sure we accept new stream clone bundle spec

login
register
mail settings
Submitter phabricator
Date Jan. 31, 2018, 4:25 p.m.
Message ID <differential-rev-PHID-DREV-sqi77oiqhznb4snmo64i-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/27095/
State Superseded
Headers show

Comments

phabricator - Jan. 31, 2018, 4:25 p.m.
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  When asked specifically, the code do a sanity check on the clone bundle to
  ensure it's a stream bundle. As we introduced a new stream bundle spec, update
  the logic to support it.
  
  With this final changeset, we can now announce safely a stream v2 clone bundle
  and old clients would not crash trying to process it.
  
  This changeset address the last comment from Gregory Szorc on the stream v2
  bundle series.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1957

AFFECTED FILES
  mercurial/exchange.py
  tests/test-stream-bundle-v2.t

CHANGE DETAILS




To: lothiraldan, #hg-reviewers
Cc: mercurial-devel
phabricator - Feb. 7, 2018, 4:20 p.m.
lothiraldan added a subscriber: indygreg.
lothiraldan added a comment.


  @indygreg Could you take a look at the series before it gets too distant to merge cleanly?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1957

To: lothiraldan, #hg-reviewers
Cc: indygreg, mercurial-devel
phabricator - Feb. 20, 2018, 10:52 a.m.
lothiraldan added a comment.


  Ping on this series

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1957

To: lothiraldan, #hg-reviewers
Cc: indygreg, mercurial-devel
phabricator - Feb. 21, 2018, 4:53 a.m.
indygreg added a comment.


  In general, I'm pretty happy with this series. Although I held off accepting changesets because I think we should have a mini discussion about //content options// versus //capabilities// before things get out of control and we duplicate too much logic.
  
  I'd also like to note that bundle specs are intended to be user facing and their behavior should be as simple as possible for people. e.g. consider adding keywords to parameters instead of requiring parameters have values.
  
  Also, while you are here, we should consider defining a `v3` bundlespec that allows embedding of bookmarks, phases, obsolescence markers, etc. Basically all the modern features of bundle2 that modern peers and servers will negotiate with each other.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1957

To: lothiraldan, #hg-reviewers
Cc: indygreg, mercurial-devel

Patch

diff --git a/tests/test-stream-bundle-v2.t b/tests/test-stream-bundle-v2.t
--- a/tests/test-stream-bundle-v2.t
+++ b/tests/test-stream-bundle-v2.t
@@ -112,3 +112,55 @@ 
    E: remote created -> g
   getting E
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+  $ hg clone --stream http://localhost:$HGPORT streamv2-clone-explicit --debug
+  using http://localhost:$HGPORT/
+  sending capabilities command
+  sending clonebundles command
+  applying clone bundle from http://localhost:$HGPORT1/bundle.hg
+  bundle2-input-bundle: with-transaction
+  bundle2-input-part: "stream2" (params: 3 mandatory) supported
+  applying stream bundle
+  11 files to transfer, 1.65 KB of data
+  adding [s] data/A.i (66 bytes)
+  adding [s] data/B.i (66 bytes)
+  adding [s] data/C.i (66 bytes)
+  adding [s] data/D.i (66 bytes)
+  adding [s] data/E.i (66 bytes)
+  adding [s] 00manifest.i (584 bytes)
+  adding [s] 00changelog.i (595 bytes)
+  adding [s] phaseroots (43 bytes)
+  adding [c] branch2-served (94 bytes)
+  adding [c] rbc-names-v1 (7 bytes)
+  adding [c] rbc-revs-v1 (40 bytes)
+  transferred 1.65 KB in *.* seconds (*/sec) (glob)
+  bundle2-input-part: total payload size 1840
+  bundle2-input-bundle: 0 parts total
+  finished applying clone bundle
+  query 1; heads
+  sending batch command
+  searching for changes
+  all remote heads known locally
+  no changes found
+  sending getbundle command
+  bundle2-input-bundle: with-transaction
+  bundle2-input-part: "listkeys" (params: 1 mandatory) supported
+  bundle2-input-part: "phase-heads" supported
+  bundle2-input-part: total payload size 24
+  bundle2-input-bundle: 1 parts total
+  checking for updated bookmarks
+  updating to branch default
+  resolving manifests
+   branchmerge: False, force: False, partial: False
+   ancestor: 000000000000, local: 000000000000+, remote: 9bc730a19041
+   A: remote created -> g
+  getting A
+   B: remote created -> g
+  getting B
+   C: remote created -> g
+  getting C
+   D: remote created -> g
+  getting D
+   E: remote created -> g
+  getting E
+  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -2155,6 +2155,17 @@ 
 
     return m
 
+def isstreamclonespec(comp, version, params, contentops):
+    # Stream clone v1
+    if (comp == 'UN' and version == 's1'):
+        return True
+
+    # Stream clone v2
+    if (comp == 'UN' and version == '02' and contentops.get('streamv2')):
+        return True
+
+    return False
+
 def filterclonebundleentries(repo, entries, streamclonerequested=False):
     """Remove incompatible clone bundle manifest entries.
 
@@ -2170,11 +2181,13 @@ 
         spec = entry.get('BUNDLESPEC')
         if spec:
             try:
-                comp, version, params, _ = parsebundlespec(repo, spec, strict=True)
+                comp, version, params, contentops = parsebundlespec(
+                    repo, spec, strict=True)
 
                 # If a stream clone was requested, filter out non-streamclone
                 # entries.
-                if streamclonerequested and (comp != 'UN' or version != 's1'):
+                if streamclonerequested and not isstreamclonespec(
+                        comp, version, params, contentops):
                     repo.ui.debug('filtering %s because not a stream clone\n' %
                                   entry['URL'])
                     continue