Patchwork [2,of,3,V2] changegroup: refactor outgoing logic into a function

login
register
mail settings
Submitter Durham Goode
Date May 8, 2014, 5:23 p.m.
Message ID <0272fd7f275a34fc2284.1399569833@dev2000.prn2.facebook.com>
Download mbox | patch
Permalink /patch/4672/
State Accepted
Headers show

Comments

Durham Goode - May 8, 2014, 5:23 p.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1399508554 25200
#      Wed May 07 17:22:34 2014 -0700
# Node ID 0272fd7f275a34fc22849dc24919825b52574611
# Parent  c727b16938123025ab733c7c996bec556e45860a
changegroup: refactor outgoing logic into a function

Extensions that add to bundle2 will want to know which commits are outgoing so
they can bundle data that is appropriate to those commits. This moves the logic
for figuring that out to a separate function so extensions can do the same
computation.

Patch

diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py
--- a/mercurial/changegroup.py
+++ b/mercurial/changegroup.py
@@ -493,6 +493,22 @@ 
     bundler = bundle10(repo, bundlecaps)
     return getsubset(repo, outgoing, bundler, source)
 
+def _computeoutgoing(repo, heads, common):
+    """Computes which revs are outgoing given a set of common
+    and a set of heads.
+
+    This is a separate function so extensions can have access to
+    the logic."""
+    cl = repo.changelog
+    if common:
+        hasnode = cl.hasnode
+        common = [n for n in common if hasnode(n)]
+    else:
+        common = [nullid]
+    if not heads:
+        heads = cl.heads()
+    return discovery.outgoing(cl, common, heads)
+
 def getbundle(repo, source, heads=None, common=None, bundlecaps=None):
     """Like changegroupsubset, but returns the set difference between the
     ancestors of heads and the ancestors common.
@@ -502,15 +518,7 @@ 
     The nodes in common might not all be known locally due to the way the
     current discovery protocol works.
     """
-    cl = repo.changelog
-    if common:
-        hasnode = cl.hasnode
-        common = [n for n in common if hasnode(n)]
-    else:
-        common = [nullid]
-    if not heads:
-        heads = cl.heads()
-    outgoing = discovery.outgoing(cl, common, heads)
+    outgoing = _computeoutgoing(repo, heads, common)
     return getlocalbundle(repo, source, outgoing, bundlecaps=bundlecaps)
 
 def changegroup(repo, basenodes, source):