Mercurial > public > mercurial-scm > hg-stable

diff mercurial/bundle2.py @ 24851:df0ce98c882f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: also save output when error happens during part processing Until this changeset, we were only able to save output if an error happened during the 'transaction.close()' phase. If the 'processbundle' call raised an exception, the 'bundleoperation' object was never returned, so the reply bundle was never accessible and no output could be salvaged. We introduce a quick (but not very elegant) fix to gain access to any reply created during the processing. This conclude this output related series. We should hopefully be able client-side to see the whole server output, in a proper order. The code is now complex enough that a refactoring of it would make sense on default.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 23 Apr 2015 16:36:18 +0100
parents aff2aca3420e
children e530cde6d115
line wrap: on
line diff
--- a/mercurial/bundle2.py	Thu Apr 23 14:54:45 2015 +0100
+++ b/mercurial/bundle2.py	Thu Apr 23 16:36:18 2015 +0100
@@ -285,7 +285,7 @@
     to be created"""
     raise TransactionUnavailable()
 
-def processbundle(repo, unbundler, transactiongetter=None):
+def processbundle(repo, unbundler, transactiongetter=None, op=None):
     """This function process a bundle, apply effect to/from a repo
 
     It iterates over each part then searches for and uses the proper handling
@@ -295,10 +295,16 @@
     before final usage.
 
     Unknown Mandatory part will abort the process.
+
+    It is temporarily possible to provide a prebuilt bundleoperation to the
+    function. This is used to ensure output is properly propagated in case of
+    an error during the unbundling. This output capturing part will likely be
+    reworked and this ability will probably go away in the process.
     """
-    if transactiongetter is None:
-        transactiongetter = _notransaction
-    op = bundleoperation(repo, transactiongetter)
+    if op is None:
+        if transactiongetter is None:
+            transactiongetter = _notransaction
+        op = bundleoperation(repo, transactiongetter)
     # todo:
     # - replace this is a init function soon.
     # - exception catching