Merge lp:~jameinel/bzr/bugfix399366 into lp:~bzr/bzr/trunk-old

[John A Meinel]

[John A Meinel (jameinel)]

This is also proposed for merging into the bzr.1.17 branch.

This change is required to build the 'python-installers' (not the all-in-one, since that is fixed to be used with python2.5).

It just stops calling a C api that wasn't available in python2.4 and uses 'frozenset()' directly. It is probably trivially slower than the existing code path. Not enough to really worry about.

[Vincent Ladeuil (vila)]

AFAICS the penalty would be once (or twice) per heads() call, so nothing dramatic.
Did you measure it ?

Otherwise, it's trivial and required, so land it !

review: Approve

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Vincent Ladeuil wrote:
> Review: Approve
> AFAICS the penalty would be once (or twice) per heads() call, so nothing dramatic.
> Did you measure it ?
>
> Otherwise, it's trivial and required, so land it !

well, it is 1/heads call, and back when we were calling heads() 200k
times for NEWS, it isn't that trivial.

But the code has changed, and yeah, I don't think it is particularly
dramatic.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkpczn8ACgkQJdeBCYSNAAMDgACgjrsImFm6S+oQXNWhs7MB167E
xdsAn217qlEcDR6Y+uU6IrmBfxw3mJVD
=HTIX
-----END PGP SIGNATURE-----

=== modified file 'NEWS'
--- NEWS	2009-07-20 06:58:15 +0000
+++ NEWS	2009-07-20 08:36:49 +0000
@@ -6,6 +6,7 @@
 .. contents:: List of Releases
    :depth: 1
 
+<<<<<<< TREE
 
 In Development
 ##############
@@ -76,6 +77,19 @@
 *********
 
 
+=======
+bzr 1.17
+########
+
+Bug Fixes
+*********
+
+* Change an extension to call the python ``frozenset()`` rather than the C
+  api ``PyFrozenSet_New``. It turns out that python2.4 did not expose the
+  C api. (John Arbash Meinel, #399366)
+
+
+>>>>>>> MERGE-SOURCE
 bzr 1.17rc1 "So late it's brunch" 2009-07-13
 ############################################
 
 
=== modified file 'bzrlib/_known_graph_pyx.pyx'
--- bzrlib/_known_graph_pyx.pyx	2009-06-19 20:35:35 +0000
+++ bzrlib/_known_graph_pyx.pyx	2009-07-20 08:36:49 +0000
@@ -25,8 +25,6 @@
     ctypedef struct PyObject:
         pass
 
-    object PyFrozenSet_New(object)
-
     object PyTuple_New(Py_ssize_t n)
     Py_ssize_t PyTuple_GET_SIZE(object t)
     PyObject * PyTuple_GET_ITEM(object t, Py_ssize_t o)
@@ -267,7 +265,7 @@
         cdef Py_ssize_t pos, last_item
         cdef long min_gdfo
 
-        heads_key = PyFrozenSet_New(keys)
+        heads_key = frozenset(keys)
         maybe_heads = PyDict_GetItem(self._known_heads, heads_key)
         if maybe_heads != NULL:
             return <object>maybe_heads
@@ -285,7 +283,7 @@
             if not candidate_nodes:
                 return frozenset([NULL_REVISION])
             # The keys changed, so recalculate heads_key
-            heads_key = PyFrozenSet_New(candidate_nodes)
+            heads_key = frozenset(candidate_nodes)
         if PyDict_Size(candidate_nodes) < 2:
             return heads_key
 
@@ -330,7 +328,7 @@
             node = <_KnownGraphNode>temp_node
             if not node.seen:
                 PyList_Append(heads, node.key)
-        heads = PyFrozenSet_New(heads)
+        heads = frozenset(heads)
         for pos from 0 <= pos < PyList_GET_SIZE(cleanup):
             node = _get_list_node(cleanup, pos)
             node.seen = 0