Patchwork [1,of,2,v3] pullbundle2: extract addchangegroup result comining into its own function

login
register
mail settings
Submitter Eric Sumner
Date Jan. 16, 2015, 9:45 p.m.
Message ID <8e4eb0dc42df5f062bec.1421444708@dev911.prn1.facebook.com>
Download mbox | patch
Permalink /patch/7497/
State Deferred
Headers show

Comments

Eric Sumner - Jan. 16, 2015, 9:45 p.m.
# HG changeset patch
# User Eric Sumner <ericsumner@fb.com>
# Date 1421441625 28800
#      Fri Jan 16 12:53:45 2015 -0800
# Node ID 8e4eb0dc42df5f062bec64230e6da54800abde60
# Parent  e07587a186a859fdb065b9475afd0470e2ae4508
pullbundle2: extract addchangegroup result comining into its own function

This will also be used for 'hg unbundle'

Patch

diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py
--- a/mercurial/changegroup.py
+++ b/mercurial/changegroup.py
@@ -42,6 +42,25 @@ 
     """return a changegroup chunk header (string) for a zero-length chunk"""
     return struct.pack(">l", 0)
 
+def combineresults(results):
+    """logic to combine 0 or more addchangegroup results into one"""
+    changedheads = 0
+    result = 1
+    for ret in results:
+        # If any changegroup result is 0, return 0
+        if ret == 0:
+            result = 0
+            break
+        if ret < -1:
+            changedheads += ret + 1
+        elif ret > 1:
+            changedheads += ret - 1
+    if changedheads > 0:
+        result = 1 + changedheads
+    elif changedheads < 0:
+        result = -1 + changedheads
+    return result
+
 class nocompress(object):
     def compress(self, x):
         return x
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -992,22 +992,8 @@ 
         raise util.Abort('missing support for %s' % exc)
 
     if pullop.fetch:
-        changedheads = 0
-        pullop.cgresult = 1
-        for cg in op.records['changegroup']:
-            ret = cg['return']
-            # If any changegroup result is 0, return 0
-            if ret == 0:
-                pullop.cgresult = 0
-                break
-            if ret < -1:
-                changedheads += ret + 1
-            elif ret > 1:
-                changedheads += ret - 1
-        if changedheads > 0:
-            pullop.cgresult = 1 + changedheads
-        elif changedheads < 0:
-            pullop.cgresult = -1 + changedheads
+        results = [cg['return'] for cg in op.records['changegroup']]
+        pullop.cgresult = changegroup.combineresults(results)
 
     # processing phases change
     for namespace, value in op.records['listkeys']: