unbundle: extract the core logic in another function

The `exchange` module now contains an `unbundle` function that holds the core
unbundle logic. The wire protocol keeps its own unbundle function. It enforces
wireprotocol-specific logic and then calls the extracted function.

This aims at implementing unbundle for localrepo.

mercurial/exchange.py

@@ -5,6 +5,7 b''
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
+import sys
 from i18n import _
 from node import hex, nullid
 import cStringIO
@@ -628,3 +629,28 b' def check_heads(repo, their_heads, conte'
         # were transferring data
         raise PushRaced('repository changed while %s - '
                         'please try again' % context)
+
+def unbundle(repo, cg, heads, source, url):
+    """Apply a bundle to a repo.
+
+    this function makes sure the repo is locked during the application and have
+    mechanism to check that no push race occured between the creation of the
+    bundle and its application.
+
+    If the push was raced as PushRaced exception is raised."""
+    r = 0
+    lock = repo.lock()
+    try:
+        check_heads(repo, heads, 'uploading changes')
+        # push can proceed
+        try:
+            r = changegroup.addchangegroup(repo, cg, source, url)
+        except util.Abort, inst:
+            # The old code we moved used sys.stderr directly.
+            # We did not changed it to minise code change.
+            # This need to be moved to something proper.
+            # Feel free to do it.
+            sys.stderr.write("abort: %s\n" % inst)
+    finally:
+        lock.release()
+    return r

mercurial/wireproto.py

@@ -765,21 +765,10 b' def unbundle(repo, proto, heads):'
         r = 0
         try:
             proto.getfile(fp)
-            lock = repo.lock()
-            try:
-                exchange.check_heads(repo, their_heads, 'uploading changes')
-
-                # push can proceed
                 fp.seek(0)
                 gen = changegroupmod.readbundle(fp, None)
-
-                try:
-                    r = changegroupmod.addchangegroup(repo, gen, 'serve',
+            r = exchange.unbundle(repo, gen, their_heads, 'serve',
                                                       proto._client())
-                except util.Abort, inst:
-                    sys.stderr.write("abort: %s\n" % inst)
-            finally:
-                lock.release()
             return pushres(r)
 
         finally: