Rev 2477: remove the .c file for now, so it doesn't clutter things in http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/dirstate_pyrex

John Arbash Meinel john at arbash-meinel.com
Fri May 4 00:34:32 BST 2007


At http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/dirstate_pyrex

------------------------------------------------------------
revno: 2477
revision-id: john at arbash-meinel.com-20070503233314-btj1vbd2qtod34kq
parent: john at arbash-meinel.com-20070503211741-b51wshh2i5ecw50i
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-05-03 18:33:14 -0500
message:
  remove the .c file for now, so it doesn't clutter things
removed:
  bzrlib/compiled/dirstate_helpers.c dirstate_helpers.c-20070503201057-u425eni465q4idwn-2
modified:
  .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
-------------- next part --------------
=== removed file 'bzrlib/compiled/dirstate_helpers.c'
--- a/bzrlib/compiled/dirstate_helpers.c	2007-05-03 20:11:37 +0000
+++ b/bzrlib/compiled/dirstate_helpers.c	1970-01-01 00:00:00 +0000
@@ -1,887 +0,0 @@
-/* Generated by Pyrex 0.9.5.1a on Thu May  3 15:09:51 2007 */
-
-#include "Python.h"
-#include "structmember.h"
-#ifndef PY_LONG_LONG
-  #define PY_LONG_LONG LONG_LONG
-#endif
-#ifdef __cplusplus
-#define __PYX_EXTERN_C extern "C"
-#else
-#define __PYX_EXTERN_C extern
-#endif
-__PYX_EXTERN_C double pow(double, double);
-
-
-typedef struct {PyObject **p; char *s;} __Pyx_InternTabEntry; /*proto*/
-typedef struct {PyObject **p; char *s; long n;} __Pyx_StringTabEntry; /*proto*/
-
-static PyObject *__pyx_m;
-static PyObject *__pyx_b;
-static int __pyx_lineno;
-static char *__pyx_filename;
-static char **__pyx_f;
-
-static char __pyx_mdoc[] = "Helper functions for DirState.\n\nThis is the python implementation for DirState functions.\n";
-
-static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/
-
-static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/
-
-static int __Pyx_InternStrings(__Pyx_InternTabEntry *t); /*proto*/
-
-static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/
-
-static void __Pyx_AddTraceback(char *funcname); /*proto*/
-
-/* Declarations from dirstate_helpers */
-
-
-
-/* Implementation of dirstate_helpers */
-
-static char (__pyx_k1[]) = "bzrlib.dirstate";
-
-static PyObject *__pyx_n_DirState;
-static PyObject *__pyx_n__read_dirblocks;
-
-static PyObject *__pyx_k1p;
-
-static PyObject *__pyx_n__state_file;
-static PyObject *__pyx_n_seek;
-static PyObject *__pyx_n__end_of_header;
-static PyObject *__pyx_n_read;
-static PyObject *__pyx_n_split;
-static PyObject *__pyx_n_pop;
-static PyObject *__pyx_n__num_present_parents;
-static PyObject *__pyx_n__fields_per_entry;
-static PyObject *__pyx_n__num_entries;
-static PyObject *__pyx_n_len;
-static PyObject *__pyx_n_int;
-static PyObject *__pyx_n_iter;
-static PyObject *__pyx_n_next;
-static PyObject *__pyx_n_xrange;
-static PyObject *__pyx_n__dirblocks;
-static PyObject *__pyx_n_append;
-static PyObject *__pyx_n_y;
-static PyObject *__pyx_n__split_root_dirblock_into_contents;
-static PyObject *__pyx_n__get_fields_to_entry;
-static PyObject *__pyx_n__entries_to_current_state;
-static PyObject *__pyx_n_IN_MEMORY_UNMODIFIED;
-static PyObject *__pyx_n__dirblock_state;
-
-static PyObject *__pyx_k3p;
-static PyObject *__pyx_k4p;
-static PyObject *__pyx_k5p;
-static PyObject *__pyx_k6p;
-static PyObject *__pyx_k7p;
-static PyObject *__pyx_k8p;
-static PyObject *__pyx_k11p;
-
-static char (__pyx_k3[]) = "\0";
-static char (__pyx_k4[]) = "";
-static char (__pyx_k5[]) = "field count incorrect %s != %s, entry_size=%s, num_entries=%s fields=%r";
-static char (__pyx_k6[]) = "";
-static char (__pyx_k7[]) = "";
-static char (__pyx_k8[]) = "";
-static char (__pyx_k11[]) = "\n";
-
-static PyObject *__pyx_f_16dirstate_helpers__read_dirblocks(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
-static char __pyx_doc_16dirstate_helpers__read_dirblocks[] = "Read in the dirblocks for the given DirState object.\n\n    This is tightly bound to the DirState internal representation. It should be\n    thought of as a member function, which is only separated out so that we can\n    re-write it in pyrex.\n\n    :param state: A DirState object.\n    :return: None\n    ";
-static PyObject *__pyx_f_16dirstate_helpers__read_dirblocks(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
-  PyObject *__pyx_v_state = 0;
-  int __pyx_v_pos;
-  int __pyx_v_entry_size;
-  int __pyx_v_field_count;
-  PyObject *__pyx_v_text;
-  PyObject *__pyx_v_fields;
-  PyObject *__pyx_v_trailing;
-  PyObject *__pyx_v_cur;
-  PyObject *__pyx_v_num_present_parents;
-  PyObject *__pyx_v_tree_count;
-  PyObject *__pyx_v_expected_field_count;
-  PyObject *__pyx_v__int;
-  PyObject *__pyx_v_next;
-  PyObject *__pyx_v_x;
-  PyObject *__pyx_v_current_block;
-  PyObject *__pyx_v_current_dirname;
-  PyObject *__pyx_v_append_entry;
-  PyObject *__pyx_v_count;
-  PyObject *__pyx_v_dirname;
-  PyObject *__pyx_v_name;
-  PyObject *__pyx_v_file_id;
-  PyObject *__pyx_v_entry;
-  PyObject *__pyx_v_fields_to_entry;
-  PyObject *__pyx_v_entries;
-  PyObject *__pyx_v_entries_append;
-  PyObject *__pyx_r;
-  PyObject *__pyx_1 = 0;
-  PyObject *__pyx_2 = 0;
-  PyObject *__pyx_3 = 0;
-  int __pyx_4;
-  PyObject *__pyx_5 = 0;
-  PyObject *__pyx_6 = 0;
-  PyObject *__pyx_7 = 0;
-  PyObject *__pyx_8 = 0;
-  PyObject *__pyx_9 = 0;
-  PyObject *__pyx_10 = 0;
-  static char *__pyx_argnames[] = {"state",0};
-  if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_state)) return 0;
-  Py_INCREF(__pyx_v_state);
-  __pyx_v_text = Py_None; Py_INCREF(Py_None);
-  __pyx_v_fields = Py_None; Py_INCREF(Py_None);
-  __pyx_v_trailing = Py_None; Py_INCREF(Py_None);
-  __pyx_v_cur = Py_None; Py_INCREF(Py_None);
-  __pyx_v_num_present_parents = Py_None; Py_INCREF(Py_None);
-  __pyx_v_tree_count = Py_None; Py_INCREF(Py_None);
-  __pyx_v_expected_field_count = Py_None; Py_INCREF(Py_None);
-  __pyx_v__int = Py_None; Py_INCREF(Py_None);
-  __pyx_v_next = Py_None; Py_INCREF(Py_None);
-  __pyx_v_x = Py_None; Py_INCREF(Py_None);
-  __pyx_v_current_block = Py_None; Py_INCREF(Py_None);
-  __pyx_v_current_dirname = Py_None; Py_INCREF(Py_None);
-  __pyx_v_append_entry = Py_None; Py_INCREF(Py_None);
-  __pyx_v_count = Py_None; Py_INCREF(Py_None);
-  __pyx_v_dirname = Py_None; Py_INCREF(Py_None);
-  __pyx_v_name = Py_None; Py_INCREF(Py_None);
-  __pyx_v_file_id = Py_None; Py_INCREF(Py_None);
-  __pyx_v_entry = Py_None; Py_INCREF(Py_None);
-  __pyx_v_fields_to_entry = Py_None; Py_INCREF(Py_None);
-  __pyx_v_entries = Py_None; Py_INCREF(Py_None);
-  __pyx_v_entries_append = Py_None; Py_INCREF(Py_None);
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":39 */
-  __pyx_1 = PyObject_GetAttr(__pyx_v_state, __pyx_n__state_file); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; goto __pyx_L1;}
-  __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_seek); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_1 = PyObject_GetAttr(__pyx_v_state, __pyx_n__end_of_header); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; goto __pyx_L1;}
-  __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; goto __pyx_L1;}
-  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
-  __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; goto __pyx_L1;}
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":40 */
-  __pyx_2 = PyObject_GetAttr(__pyx_v_state, __pyx_n__state_file); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; goto __pyx_L1;}
-  __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_read); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; goto __pyx_L1;}
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_v_text);
-  __pyx_v_text = __pyx_1;
-  __pyx_1 = 0;
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":43 */
-  __pyx_2 = PyObject_GetAttr(__pyx_v_text, __pyx_n_split); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; goto __pyx_L1;}
-  __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; goto __pyx_L1;}
-  Py_INCREF(__pyx_k3p);
-  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k3p);
-  __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; goto __pyx_L1;}
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_v_fields);
-  __pyx_v_fields = __pyx_1;
-  __pyx_1 = 0;
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":45 */
-  __pyx_2 = PyObject_GetAttr(__pyx_v_fields, __pyx_n_pop); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 45; goto __pyx_L1;}
-  __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 45; goto __pyx_L1;}
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  Py_DECREF(__pyx_v_trailing);
-  __pyx_v_trailing = __pyx_3;
-  __pyx_3 = 0;
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":46 */
-  if (PyObject_Cmp(__pyx_v_trailing, __pyx_k4p, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; goto __pyx_L1;}
-  __pyx_4 = __pyx_4 == 0;
-  if (!__pyx_4) {
-    PyErr_SetNone(PyExc_AssertionError);
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; goto __pyx_L1;}
-  }
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":50 */
-  __pyx_1 = PyInt_FromLong(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 50; goto __pyx_L1;}
-  Py_DECREF(__pyx_v_cur);
-  __pyx_v_cur = __pyx_1;
-  __pyx_1 = 0;
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":57 */
-  __pyx_2 = PyObject_GetAttr(__pyx_v_state, __pyx_n__num_present_parents); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; goto __pyx_L1;}
-  __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; goto __pyx_L1;}
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  Py_DECREF(__pyx_v_num_present_parents);
-  __pyx_v_num_present_parents = __pyx_3;
-  __pyx_3 = 0;
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":58 */
-  __pyx_1 = PyInt_FromLong(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; goto __pyx_L1;}
-  __pyx_2 = PyNumber_Add(__pyx_1, __pyx_v_num_present_parents); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_DECREF(__pyx_v_tree_count);
-  __pyx_v_tree_count = __pyx_2;
-  __pyx_2 = 0;
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":59 */
-  __pyx_3 = PyObject_GetAttr(__pyx_v_state, __pyx_n__fields_per_entry); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; goto __pyx_L1;}
-  __pyx_1 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_4 = PyInt_AsLong(__pyx_1); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_v_entry_size = __pyx_4;
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":60 */
-  __pyx_2 = PyInt_FromLong(__pyx_v_entry_size); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; goto __pyx_L1;}
-  __pyx_3 = PyObject_GetAttr(__pyx_v_state, __pyx_n__num_entries); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; goto __pyx_L1;}
-  __pyx_1 = PyNumber_Multiply(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; goto __pyx_L1;}
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_v_expected_field_count);
-  __pyx_v_expected_field_count = __pyx_1;
-  __pyx_1 = 0;
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":61 */
-  __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; goto __pyx_L1;}
-  __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; goto __pyx_L1;}
-  Py_INCREF(__pyx_v_fields);
-  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_fields);
-  __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; goto __pyx_L1;}
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_4 = PyInt_AsLong(__pyx_1); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_v_field_count = __pyx_4;
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":63 */
-  __pyx_2 = PyInt_FromLong(__pyx_v_field_count); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; goto __pyx_L1;}
-  __pyx_3 = PyNumber_Subtract(__pyx_2, __pyx_v_cur); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; goto __pyx_L1;}
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  if (PyObject_Cmp(__pyx_3, __pyx_v_expected_field_count, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; goto __pyx_L1;}
-  __pyx_4 = __pyx_4 == 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_1 = PyInt_FromLong(__pyx_v_field_count); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; goto __pyx_L1;}
-  __pyx_2 = PyNumber_Subtract(__pyx_1, __pyx_v_cur); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_3 = PyInt_FromLong(__pyx_v_entry_size); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; goto __pyx_L1;}
-  __pyx_1 = PyObject_GetAttr(__pyx_v_state, __pyx_n__num_entries); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 67; goto __pyx_L1;}
-  __pyx_5 = PyTuple_New(5); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; goto __pyx_L1;}
-  PyTuple_SET_ITEM(__pyx_5, 0, __pyx_2);
-  Py_INCREF(__pyx_v_expected_field_count);
-  PyTuple_SET_ITEM(__pyx_5, 1, __pyx_v_expected_field_count);
-  PyTuple_SET_ITEM(__pyx_5, 2, __pyx_3);
-  PyTuple_SET_ITEM(__pyx_5, 3, __pyx_1);
-  Py_INCREF(__pyx_v_fields);
-  PyTuple_SET_ITEM(__pyx_5, 4, __pyx_v_fields);
-  __pyx_2 = 0;
-  __pyx_3 = 0;
-  __pyx_1 = 0;
-  __pyx_2 = PyNumber_Remainder(__pyx_k5p, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; goto __pyx_L1;}
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  if (!__pyx_4) {
-    PyErr_SetObject(PyExc_AssertionError, __pyx_2);
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; goto __pyx_L1;}
-  }
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":69 */
-  __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;}
-  if (PyObject_Cmp(__pyx_v_num_present_parents, __pyx_3, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;}
-  __pyx_4 = __pyx_4 == 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  if (__pyx_4) {
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":71 */
-    __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; goto __pyx_L1;}
-    Py_DECREF(__pyx_v__int);
-    __pyx_v__int = __pyx_1;
-    __pyx_1 = 0;
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":76 */
-    __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_iter); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; goto __pyx_L1;}
-    __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; goto __pyx_L1;}
-    Py_INCREF(__pyx_v_fields);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_fields);
-    __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; goto __pyx_L1;}
-    Py_DECREF(__pyx_5); __pyx_5 = 0;
-    Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_next); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; goto __pyx_L1;}
-    Py_DECREF(__pyx_3); __pyx_3 = 0;
-    Py_DECREF(__pyx_v_next);
-    __pyx_v_next = __pyx_1;
-    __pyx_1 = 0;
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":78 */
-    __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_xrange); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; goto __pyx_L1;}
-    __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; goto __pyx_L1;}
-    Py_INCREF(__pyx_v_cur);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_cur);
-    __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; goto __pyx_L1;}
-    Py_DECREF(__pyx_5); __pyx_5 = 0;
-    Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_1 = PyObject_GetIter(__pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; goto __pyx_L1;}
-    Py_DECREF(__pyx_3); __pyx_3 = 0;
-    for (;;) {
-      __pyx_5 = PyIter_Next(__pyx_1);
-      if (!__pyx_5) {
-        if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; goto __pyx_L1;}
-        break;
-      }
-      Py_DECREF(__pyx_v_x);
-      __pyx_v_x = __pyx_5;
-      __pyx_5 = 0;
-
-      /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":79 */
-      __pyx_2 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; goto __pyx_L1;}
-      Py_DECREF(__pyx_2); __pyx_2 = 0;
-    }
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":82 */
-    __pyx_3 = PyList_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; goto __pyx_L1;}
-    __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; goto __pyx_L1;}
-    Py_INCREF(__pyx_k6p);
-    PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k6p);
-    PyTuple_SET_ITEM(__pyx_5, 1, __pyx_3);
-    __pyx_3 = 0;
-    __pyx_2 = PyList_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; goto __pyx_L1;}
-    __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; goto __pyx_L1;}
-    Py_INCREF(__pyx_k7p);
-    PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k7p);
-    PyTuple_SET_ITEM(__pyx_1, 1, __pyx_2);
-    __pyx_2 = 0;
-    __pyx_3 = PyList_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; goto __pyx_L1;}
-    PyList_SET_ITEM(__pyx_3, 0, __pyx_5);
-    PyList_SET_ITEM(__pyx_3, 1, __pyx_1);
-    __pyx_5 = 0;
-    __pyx_1 = 0;
-    if (PyObject_SetAttr(__pyx_v_state, __pyx_n__dirblocks, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; goto __pyx_L1;}
-    Py_DECREF(__pyx_3); __pyx_3 = 0;
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":83 */
-    __pyx_2 = PyObject_GetAttr(__pyx_v_state, __pyx_n__dirblocks); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 83; goto __pyx_L1;}
-    __pyx_5 = PyInt_FromLong(0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 83; goto __pyx_L1;}
-    __pyx_1 = PyObject_GetItem(__pyx_2, __pyx_5); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 83; goto __pyx_L1;}
-    Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_DECREF(__pyx_5); __pyx_5 = 0;
-    __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 83; goto __pyx_L1;}
-    __pyx_2 = PyObject_GetItem(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 83; goto __pyx_L1;}
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
-    Py_DECREF(__pyx_3); __pyx_3 = 0;
-    Py_DECREF(__pyx_v_current_block);
-    __pyx_v_current_block = __pyx_2;
-    __pyx_2 = 0;
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":84 */
-    Py_INCREF(__pyx_k8p);
-    Py_DECREF(__pyx_v_current_dirname);
-    __pyx_v_current_dirname = __pyx_k8p;
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":85 */
-    __pyx_5 = PyObject_GetAttr(__pyx_v_current_block, __pyx_n_append); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 85; goto __pyx_L1;}
-    Py_DECREF(__pyx_v_append_entry);
-    __pyx_v_append_entry = __pyx_5;
-    __pyx_5 = 0;
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":86 */
-    __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_xrange); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; goto __pyx_L1;}
-    __pyx_3 = PyObject_GetAttr(__pyx_v_state, __pyx_n__num_entries); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; goto __pyx_L1;}
-    __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; goto __pyx_L1;}
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_3);
-    __pyx_3 = 0;
-    __pyx_5 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; goto __pyx_L1;}
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
-    Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_3 = PyObject_GetIter(__pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; goto __pyx_L1;}
-    Py_DECREF(__pyx_5); __pyx_5 = 0;
-    for (;;) {
-      __pyx_1 = PyIter_Next(__pyx_3);
-      if (!__pyx_1) {
-        if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; goto __pyx_L1;}
-        break;
-      }
-      Py_DECREF(__pyx_v_count);
-      __pyx_v_count = __pyx_1;
-      __pyx_1 = 0;
-
-      /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":87 */
-      __pyx_2 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; goto __pyx_L1;}
-      Py_DECREF(__pyx_v_dirname);
-      __pyx_v_dirname = __pyx_2;
-      __pyx_2 = 0;
-
-      /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":88 */
-      __pyx_5 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; goto __pyx_L1;}
-      Py_DECREF(__pyx_v_name);
-      __pyx_v_name = __pyx_5;
-      __pyx_5 = 0;
-
-      /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":89 */
-      __pyx_1 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; goto __pyx_L1;}
-      Py_DECREF(__pyx_v_file_id);
-      __pyx_v_file_id = __pyx_1;
-      __pyx_1 = 0;
-
-      /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":90 */
-      if (PyObject_Cmp(__pyx_v_dirname, __pyx_v_current_dirname, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; goto __pyx_L1;}
-      __pyx_4 = __pyx_4 != 0;
-      if (__pyx_4) {
-
-        /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":92 */
-        __pyx_2 = PyList_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; goto __pyx_L1;}
-        Py_DECREF(__pyx_v_current_block);
-        __pyx_v_current_block = __pyx_2;
-        __pyx_2 = 0;
-
-        /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":93 */
-        Py_INCREF(__pyx_v_dirname);
-        Py_DECREF(__pyx_v_current_dirname);
-        __pyx_v_current_dirname = __pyx_v_dirname;
-
-        /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":94 */
-        __pyx_5 = PyObject_GetAttr(__pyx_v_state, __pyx_n__dirblocks); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; goto __pyx_L1;}
-        __pyx_1 = PyObject_GetAttr(__pyx_5, __pyx_n_append); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; goto __pyx_L1;}
-        Py_DECREF(__pyx_5); __pyx_5 = 0;
-        __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; goto __pyx_L1;}
-        Py_INCREF(__pyx_v_current_dirname);
-        PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_current_dirname);
-        Py_INCREF(__pyx_v_current_block);
-        PyTuple_SET_ITEM(__pyx_2, 1, __pyx_v_current_block);
-        __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; goto __pyx_L1;}
-        PyTuple_SET_ITEM(__pyx_5, 0, __pyx_2);
-        __pyx_2 = 0;
-        __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; goto __pyx_L1;}
-        Py_DECREF(__pyx_1); __pyx_1 = 0;
-        Py_DECREF(__pyx_5); __pyx_5 = 0;
-        Py_DECREF(__pyx_2); __pyx_2 = 0;
-
-        /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":95 */
-        __pyx_1 = PyObject_GetAttr(__pyx_v_current_block, __pyx_n_append); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 95; goto __pyx_L1;}
-        Py_DECREF(__pyx_v_append_entry);
-        __pyx_v_append_entry = __pyx_1;
-        __pyx_1 = 0;
-        goto __pyx_L7;
-      }
-      __pyx_L7:;
-
-      /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":98 */
-      __pyx_5 = PyTuple_New(3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; goto __pyx_L1;}
-      Py_INCREF(__pyx_v_current_dirname);
-      PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_current_dirname);
-      Py_INCREF(__pyx_v_name);
-      PyTuple_SET_ITEM(__pyx_5, 1, __pyx_v_name);
-      Py_INCREF(__pyx_v_file_id);
-      PyTuple_SET_ITEM(__pyx_5, 2, __pyx_v_file_id);
-      __pyx_2 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; goto __pyx_L1;}
-      __pyx_1 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 101; goto __pyx_L1;}
-      __pyx_6 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; goto __pyx_L1;}
-      __pyx_7 = PyTuple_New(1); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; goto __pyx_L1;}
-      PyTuple_SET_ITEM(__pyx_7, 0, __pyx_6);
-      __pyx_6 = 0;
-      __pyx_6 = PyObject_CallObject(__pyx_v__int, __pyx_7); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; goto __pyx_L1;}
-      Py_DECREF(__pyx_7); __pyx_7 = 0;
-      __pyx_7 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 103; goto __pyx_L1;}
-      if (PyObject_Cmp(__pyx_7, __pyx_n_y, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 103; goto __pyx_L1;}
-      __pyx_4 = __pyx_4 == 0;
-      Py_DECREF(__pyx_7); __pyx_7 = 0;
-      __pyx_7 = PyInt_FromLong(__pyx_4); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 103; goto __pyx_L1;}
-      __pyx_8 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_8) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; goto __pyx_L1;}
-      __pyx_9 = PyTuple_New(5); if (!__pyx_9) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; goto __pyx_L1;}
-      PyTuple_SET_ITEM(__pyx_9, 0, __pyx_2);
-      PyTuple_SET_ITEM(__pyx_9, 1, __pyx_1);
-      PyTuple_SET_ITEM(__pyx_9, 2, __pyx_6);
-      PyTuple_SET_ITEM(__pyx_9, 3, __pyx_7);
-      PyTuple_SET_ITEM(__pyx_9, 4, __pyx_8);
-      __pyx_2 = 0;
-      __pyx_1 = 0;
-      __pyx_6 = 0;
-      __pyx_7 = 0;
-      __pyx_8 = 0;
-      __pyx_2 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;}
-      __pyx_1 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; goto __pyx_L1;}
-      __pyx_6 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; goto __pyx_L1;}
-      __pyx_7 = PyTuple_New(1); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; goto __pyx_L1;}
-      PyTuple_SET_ITEM(__pyx_7, 0, __pyx_6);
-      __pyx_6 = 0;
-      __pyx_8 = PyObject_CallObject(__pyx_v__int, __pyx_7); if (!__pyx_8) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; goto __pyx_L1;}
-      Py_DECREF(__pyx_7); __pyx_7 = 0;
-      __pyx_6 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 110; goto __pyx_L1;}
-      if (PyObject_Cmp(__pyx_6, __pyx_n_y, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 110; goto __pyx_L1;}
-      __pyx_4 = __pyx_4 == 0;
-      Py_DECREF(__pyx_6); __pyx_6 = 0;
-      __pyx_7 = PyInt_FromLong(__pyx_4); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 110; goto __pyx_L1;}
-      __pyx_6 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; goto __pyx_L1;}
-      __pyx_10 = PyTuple_New(5); if (!__pyx_10) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;}
-      PyTuple_SET_ITEM(__pyx_10, 0, __pyx_2);
-      PyTuple_SET_ITEM(__pyx_10, 1, __pyx_1);
-      PyTuple_SET_ITEM(__pyx_10, 2, __pyx_8);
-      PyTuple_SET_ITEM(__pyx_10, 3, __pyx_7);
-      PyTuple_SET_ITEM(__pyx_10, 4, __pyx_6);
-      __pyx_2 = 0;
-      __pyx_1 = 0;
-      __pyx_8 = 0;
-      __pyx_7 = 0;
-      __pyx_6 = 0;
-      __pyx_2 = PyList_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; goto __pyx_L1;}
-      PyList_SET_ITEM(__pyx_2, 0, __pyx_9);
-      PyList_SET_ITEM(__pyx_2, 1, __pyx_10);
-      __pyx_9 = 0;
-      __pyx_10 = 0;
-      __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; goto __pyx_L1;}
-      PyTuple_SET_ITEM(__pyx_1, 0, __pyx_5);
-      PyTuple_SET_ITEM(__pyx_1, 1, __pyx_2);
-      __pyx_5 = 0;
-      __pyx_2 = 0;
-      Py_DECREF(__pyx_v_entry);
-      __pyx_v_entry = __pyx_1;
-      __pyx_1 = 0;
-
-      /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":114 */
-      __pyx_8 = PyObject_CallObject(__pyx_v_next, 0); if (!__pyx_8) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; goto __pyx_L1;}
-      Py_DECREF(__pyx_v_trailing);
-      __pyx_v_trailing = __pyx_8;
-      __pyx_8 = 0;
-
-      /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":115 */
-      if (PyObject_Cmp(__pyx_v_trailing, __pyx_k11p, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; goto __pyx_L1;}
-      __pyx_4 = __pyx_4 == 0;
-      if (!__pyx_4) {
-        PyErr_SetNone(PyExc_AssertionError);
-        {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; goto __pyx_L1;}
-      }
-
-      /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":117 */
-      __pyx_7 = PyTuple_New(1); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; goto __pyx_L1;}
-      Py_INCREF(__pyx_v_entry);
-      PyTuple_SET_ITEM(__pyx_7, 0, __pyx_v_entry);
-      __pyx_6 = PyObject_CallObject(__pyx_v_append_entry, __pyx_7); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; goto __pyx_L1;}
-      Py_DECREF(__pyx_7); __pyx_7 = 0;
-      Py_DECREF(__pyx_6); __pyx_6 = 0;
-    }
-    Py_DECREF(__pyx_3); __pyx_3 = 0;
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":118 */
-    __pyx_9 = PyObject_GetAttr(__pyx_v_state, __pyx_n__split_root_dirblock_into_contents); if (!__pyx_9) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; goto __pyx_L1;}
-    __pyx_10 = PyObject_CallObject(__pyx_9, 0); if (!__pyx_10) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; goto __pyx_L1;}
-    Py_DECREF(__pyx_9); __pyx_9 = 0;
-    Py_DECREF(__pyx_10); __pyx_10 = 0;
-    goto __pyx_L2;
-  }
-  /*else*/ {
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":121 */
-    __pyx_5 = PyObject_GetAttr(__pyx_v_state, __pyx_n__get_fields_to_entry); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;}
-    __pyx_2 = PyObject_CallObject(__pyx_5, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;}
-    Py_DECREF(__pyx_5); __pyx_5 = 0;
-    Py_DECREF(__pyx_v_fields_to_entry);
-    __pyx_v_fields_to_entry = __pyx_2;
-    __pyx_2 = 0;
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":122 */
-    __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;}
-    Py_DECREF(__pyx_v_entries);
-    __pyx_v_entries = __pyx_1;
-    __pyx_1 = 0;
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":123 */
-    __pyx_8 = PyObject_GetAttr(__pyx_v_entries, __pyx_n_append); if (!__pyx_8) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 123; goto __pyx_L1;}
-    Py_DECREF(__pyx_v_entries_append);
-    __pyx_v_entries_append = __pyx_8;
-    __pyx_8 = 0;
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":124 */
-    __pyx_4 = PyInt_AsLong(__pyx_v_cur); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 124; goto __pyx_L1;}
-    __pyx_v_pos = __pyx_4;
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":125 */
-    __pyx_v_entry_size = __pyx_v_entry_size;
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":126 */
-    while (1) {
-      __pyx_4 = (__pyx_v_pos < __pyx_v_field_count);
-      if (!__pyx_4) break;
-
-      /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":127 */
-      __pyx_7 = PySequence_GetSlice(__pyx_v_fields, __pyx_v_pos, (__pyx_v_pos + __pyx_v_entry_size)); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;}
-      __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;}
-      PyTuple_SET_ITEM(__pyx_6, 0, __pyx_7);
-      __pyx_7 = 0;
-      __pyx_3 = PyObject_CallObject(__pyx_v_fields_to_entry, __pyx_6); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;}
-      Py_DECREF(__pyx_6); __pyx_6 = 0;
-      __pyx_9 = PyTuple_New(1); if (!__pyx_9) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;}
-      PyTuple_SET_ITEM(__pyx_9, 0, __pyx_3);
-      __pyx_3 = 0;
-      __pyx_10 = PyObject_CallObject(__pyx_v_entries_append, __pyx_9); if (!__pyx_10) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;}
-      Py_DECREF(__pyx_9); __pyx_9 = 0;
-      Py_DECREF(__pyx_10); __pyx_10 = 0;
-
-      /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":128 */
-      __pyx_v_pos = (__pyx_v_pos + __pyx_v_entry_size);
-    }
-
-    /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":129 */
-    __pyx_5 = PyObject_GetAttr(__pyx_v_state, __pyx_n__entries_to_current_state); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; goto __pyx_L1;}
-    __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; goto __pyx_L1;}
-    Py_INCREF(__pyx_v_entries);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_entries);
-    __pyx_1 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; goto __pyx_L1;}
-    Py_DECREF(__pyx_5); __pyx_5 = 0;
-    Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
-  }
-  __pyx_L2:;
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":135 */
-  __pyx_8 = __Pyx_GetName(__pyx_m, __pyx_n_DirState); if (!__pyx_8) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; goto __pyx_L1;}
-  __pyx_7 = PyObject_GetAttr(__pyx_8, __pyx_n_IN_MEMORY_UNMODIFIED); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; goto __pyx_L1;}
-  Py_DECREF(__pyx_8); __pyx_8 = 0;
-  if (PyObject_SetAttr(__pyx_v_state, __pyx_n__dirblock_state, __pyx_7) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; goto __pyx_L1;}
-  Py_DECREF(__pyx_7); __pyx_7 = 0;
-
-  __pyx_r = Py_None; Py_INCREF(Py_None);
-  goto __pyx_L0;
-  __pyx_L1:;
-  Py_XDECREF(__pyx_1);
-  Py_XDECREF(__pyx_2);
-  Py_XDECREF(__pyx_3);
-  Py_XDECREF(__pyx_5);
-  Py_XDECREF(__pyx_6);
-  Py_XDECREF(__pyx_7);
-  Py_XDECREF(__pyx_8);
-  Py_XDECREF(__pyx_9);
-  Py_XDECREF(__pyx_10);
-  __Pyx_AddTraceback("dirstate_helpers._read_dirblocks");
-  __pyx_r = 0;
-  __pyx_L0:;
-  Py_DECREF(__pyx_v_text);
-  Py_DECREF(__pyx_v_fields);
-  Py_DECREF(__pyx_v_trailing);
-  Py_DECREF(__pyx_v_cur);
-  Py_DECREF(__pyx_v_num_present_parents);
-  Py_DECREF(__pyx_v_tree_count);
-  Py_DECREF(__pyx_v_expected_field_count);
-  Py_DECREF(__pyx_v__int);
-  Py_DECREF(__pyx_v_next);
-  Py_DECREF(__pyx_v_x);
-  Py_DECREF(__pyx_v_current_block);
-  Py_DECREF(__pyx_v_current_dirname);
-  Py_DECREF(__pyx_v_append_entry);
-  Py_DECREF(__pyx_v_count);
-  Py_DECREF(__pyx_v_dirname);
-  Py_DECREF(__pyx_v_name);
-  Py_DECREF(__pyx_v_file_id);
-  Py_DECREF(__pyx_v_entry);
-  Py_DECREF(__pyx_v_fields_to_entry);
-  Py_DECREF(__pyx_v_entries);
-  Py_DECREF(__pyx_v_entries_append);
-  Py_DECREF(__pyx_v_state);
-  return __pyx_r;
-}
-
-static __Pyx_InternTabEntry __pyx_intern_tab[] = {
-  {&__pyx_n_DirState, "DirState"},
-  {&__pyx_n_IN_MEMORY_UNMODIFIED, "IN_MEMORY_UNMODIFIED"},
-  {&__pyx_n__dirblock_state, "_dirblock_state"},
-  {&__pyx_n__dirblocks, "_dirblocks"},
-  {&__pyx_n__end_of_header, "_end_of_header"},
-  {&__pyx_n__entries_to_current_state, "_entries_to_current_state"},
-  {&__pyx_n__fields_per_entry, "_fields_per_entry"},
-  {&__pyx_n__get_fields_to_entry, "_get_fields_to_entry"},
-  {&__pyx_n__num_entries, "_num_entries"},
-  {&__pyx_n__num_present_parents, "_num_present_parents"},
-  {&__pyx_n__read_dirblocks, "_read_dirblocks"},
-  {&__pyx_n__split_root_dirblock_into_contents, "_split_root_dirblock_into_contents"},
-  {&__pyx_n__state_file, "_state_file"},
-  {&__pyx_n_append, "append"},
-  {&__pyx_n_int, "int"},
-  {&__pyx_n_iter, "iter"},
-  {&__pyx_n_len, "len"},
-  {&__pyx_n_next, "next"},
-  {&__pyx_n_pop, "pop"},
-  {&__pyx_n_read, "read"},
-  {&__pyx_n_seek, "seek"},
-  {&__pyx_n_split, "split"},
-  {&__pyx_n_xrange, "xrange"},
-  {&__pyx_n_y, "y"},
-  {0, 0}
-};
-
-static __Pyx_StringTabEntry __pyx_string_tab[] = {
-  {&__pyx_k1p, __pyx_k1, sizeof(__pyx_k1)},
-  {&__pyx_k3p, __pyx_k3, sizeof(__pyx_k3)},
-  {&__pyx_k4p, __pyx_k4, sizeof(__pyx_k4)},
-  {&__pyx_k5p, __pyx_k5, sizeof(__pyx_k5)},
-  {&__pyx_k6p, __pyx_k6, sizeof(__pyx_k6)},
-  {&__pyx_k7p, __pyx_k7, sizeof(__pyx_k7)},
-  {&__pyx_k8p, __pyx_k8, sizeof(__pyx_k8)},
-  {&__pyx_k11p, __pyx_k11, sizeof(__pyx_k11)},
-  {0, 0, 0}
-};
-
-static struct PyMethodDef __pyx_methods[] = {
-  {"_read_dirblocks", (PyCFunction)__pyx_f_16dirstate_helpers__read_dirblocks, METH_VARARGS|METH_KEYWORDS, __pyx_doc_16dirstate_helpers__read_dirblocks},
-  {0, 0, 0, 0}
-};
-
-static void __pyx_init_filenames(void); /*proto*/
-
-PyMODINIT_FUNC initdirstate_helpers(void); /*proto*/
-PyMODINIT_FUNC initdirstate_helpers(void) {
-  PyObject *__pyx_1 = 0;
-  PyObject *__pyx_2 = 0;
-  __pyx_init_filenames();
-  __pyx_m = Py_InitModule4("dirstate_helpers", __pyx_methods, __pyx_mdoc, 0, PYTHON_API_VERSION);
-  if (!__pyx_m) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; goto __pyx_L1;};
-  __pyx_b = PyImport_AddModule("__builtin__");
-  if (!__pyx_b) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; goto __pyx_L1;};
-  if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; goto __pyx_L1;};
-  if (__Pyx_InternStrings(__pyx_intern_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; goto __pyx_L1;};
-  if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; goto __pyx_L1;};
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":22 */
-  __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; goto __pyx_L1;}
-  Py_INCREF(__pyx_n_DirState);
-  PyList_SET_ITEM(__pyx_1, 0, __pyx_n_DirState);
-  __pyx_2 = __Pyx_Import(__pyx_k1p, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_DirState); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; goto __pyx_L1;}
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_DirState, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-
-  /* "/Users/jameinel/dev/bzr/0.17-dev/dirstate_pyrex/bzrlib/compiled/dirstate_helpers.pyx":25 */
-  return;
-  __pyx_L1:;
-  Py_XDECREF(__pyx_1);
-  Py_XDECREF(__pyx_2);
-  __Pyx_AddTraceback("dirstate_helpers");
-}
-
-static char *__pyx_filenames[] = {
-  "dirstate_helpers.pyx",
-};
-
-/* Runtime support code */
-
-static void __pyx_init_filenames(void) {
-  __pyx_f = __pyx_filenames;
-}
-
-static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list) {
-    PyObject *__import__ = 0;
-    PyObject *empty_list = 0;
-    PyObject *module = 0;
-    PyObject *global_dict = 0;
-    PyObject *empty_dict = 0;
-    PyObject *list;
-    __import__ = PyObject_GetAttrString(__pyx_b, "__import__");
-    if (!__import__)
-        goto bad;
-    if (from_list)
-        list = from_list;
-    else {
-        empty_list = PyList_New(0);
-        if (!empty_list)
-            goto bad;
-        list = empty_list;
-    }
-    global_dict = PyModule_GetDict(__pyx_m);
-    if (!global_dict)
-        goto bad;
-    empty_dict = PyDict_New();
-    if (!empty_dict)
-        goto bad;
-    module = PyObject_CallFunction(__import__, "OOOO",
-        name, global_dict, empty_dict, list);
-bad:
-    Py_XDECREF(empty_list);
-    Py_XDECREF(__import__);
-    Py_XDECREF(empty_dict);
-    return module;
-}
-
-static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name) {
-    PyObject *result;
-    result = PyObject_GetAttr(dict, name);
-    if (!result)
-        PyErr_SetObject(PyExc_NameError, name);
-    return result;
-}
-
-static int __Pyx_InternStrings(__Pyx_InternTabEntry *t) {
-    while (t->p) {
-        *t->p = PyString_InternFromString(t->s);
-        if (!*t->p)
-            return -1;
-        ++t;
-    }
-    return 0;
-}
-
-static int __Pyx_InitStrings(__Pyx_StringTabEntry *t) {
-    while (t->p) {
-        *t->p = PyString_FromStringAndSize(t->s, t->n - 1);
-        if (!*t->p)
-            return -1;
-        ++t;
-    }
-    return 0;
-}
-
-#include "compile.h"
-#include "frameobject.h"
-#include "traceback.h"
-
-static void __Pyx_AddTraceback(char *funcname) {
-    PyObject *py_srcfile = 0;
-    PyObject *py_funcname = 0;
-    PyObject *py_globals = 0;
-    PyObject *empty_tuple = 0;
-    PyObject *empty_string = 0;
-    PyCodeObject *py_code = 0;
-    PyFrameObject *py_frame = 0;
-    
-    py_srcfile = PyString_FromString(__pyx_filename);
-    if (!py_srcfile) goto bad;
-    py_funcname = PyString_FromString(funcname);
-    if (!py_funcname) goto bad;
-    py_globals = PyModule_GetDict(__pyx_m);
-    if (!py_globals) goto bad;
-    empty_tuple = PyTuple_New(0);
-    if (!empty_tuple) goto bad;
-    empty_string = PyString_FromString("");
-    if (!empty_string) goto bad;
-    py_code = PyCode_New(
-        0,            /*int argcount,*/
-        0,            /*int nlocals,*/
-        0,            /*int stacksize,*/
-        0,            /*int flags,*/
-        empty_string, /*PyObject *code,*/
-        empty_tuple,  /*PyObject *consts,*/
-        empty_tuple,  /*PyObject *names,*/
-        empty_tuple,  /*PyObject *varnames,*/
-        empty_tuple,  /*PyObject *freevars,*/
-        empty_tuple,  /*PyObject *cellvars,*/
-        py_srcfile,   /*PyObject *filename,*/
-        py_funcname,  /*PyObject *name,*/
-        __pyx_lineno,   /*int firstlineno,*/
-        empty_string  /*PyObject *lnotab*/
-    );
-    if (!py_code) goto bad;
-    py_frame = PyFrame_New(
-        PyThreadState_Get(), /*PyThreadState *tstate,*/
-        py_code,             /*PyCodeObject *code,*/
-        py_globals,          /*PyObject *globals,*/
-        0                    /*PyObject *locals*/
-    );
-    if (!py_frame) goto bad;
-    py_frame->f_lineno = __pyx_lineno;
-    PyTraceBack_Here(py_frame);
-bad:
-    Py_XDECREF(py_srcfile);
-    Py_XDECREF(py_funcname);
-    Py_XDECREF(empty_tuple);
-    Py_XDECREF(empty_string);
-    Py_XDECREF(py_code);
-    Py_XDECREF(py_frame);
-}

=== modified file '.bzrignore'
--- a/.bzrignore	2007-04-12 20:27:42 +0000
+++ b/.bzrignore	2007-05-03 23:33:14 +0000
@@ -34,3 +34,4 @@
 ./html_docs
 ./pretty_docs
 ./api
+bzrlib/compiled/*.c



More information about the bazaar-commits mailing list