Patchwork [2,of,5,V2] bundle2: feed a unbundle20 to the `processbundle` function

login
register
mail settings
Submitter Pierre-Yves David
Date April 4, 2014, 6:11 p.m.
Message ID <70bb6695fbc36bd98025.1396635109@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/4226/
State Accepted
Commit c33d7bf53812e963cea5fa9fe54caae7adbe8d99
Headers show

Comments

Pierre-Yves David - April 4, 2014, 6:11 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1396471857 25200
#      Wed Apr 02 13:50:57 2014 -0700
# Node ID 70bb6695fbc36bd98025d1858112846170a68d4b
# Parent  d29c0c3a452740d01afe2aaa9a93da293ebbf705
bundle2: feed a unbundle20 to the `processbundle` function

The unbundle can comes from multiple sources. (on disk file, peer, etc) and
(ultimately) of multiple type (bundle10, bundle20). The `processbundle` is no
longer in charge of creating the bundle.

Patch

diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
--- a/mercurial/bundle2.py
+++ b/mercurial/bundle2.py
@@ -181,31 +181,22 @@  def parthandler(parttype):
         assert lparttype not in parthandlermapping
         parthandlermapping[lparttype] = func
         return func
     return _decorator
 
-def processbundle(repo, stream):
+def processbundle(repo, unbundler):
     """This function process a bundle, apply effect to/from a repo
 
-    Currently it:
-    - parse a stream into an unbundle20 object
-    - iterate over each parts then search and use the proper handling code to
-      process the part.
-
-    Parts are processes in order.
+    It iterate over each parts then search and use the proper handling code to
+    process the part. Parts are processes in order.
 
     This is very early version of this function that will be strongly reworked
     before final usage.
 
     Unknown Mandatory part will abort the process.
     """
     ui = repo.ui
-    # Extraction of the unbundler object will most likely change. It may be
-    # done outside of this function, the unbundler would be passed as argument.
-    # in all case the unbundler will eventually be created by a
-    # `changegroup.readbundle` style function.
-    unbundler = unbundle20(ui, stream)
     # todo:
     # - replace this is a init function soon.
     # - exception catching
     unbundler.params
     iterparts = iter(unbundler)
diff --git a/tests/test-bundle2.t b/tests/test-bundle2.t
--- a/tests/test-bundle2.t
+++ b/tests/test-bundle2.t
@@ -72,11 +72,12 @@  Create an extension to test bundle2 API
   > def cmdunbundle2(ui, repo):
   >     """process a bundle2 stream from stdin on the current repo"""
   >     try:
   >         lock = repo.lock()
   >         try:
-  >             bundle2.processbundle(repo, sys.stdin)
+  >             unbundler = bundle2.unbundle20(ui, sys.stdin)
+  >             bundle2.processbundle(repo, unbundler)
   >         except KeyError, exc:
   >             raise util.Abort('missing support for %s' % exc)
   >     finally:
   >         lock.release()
   >         remains = sys.stdin.read()