~ubuntu-branches/ubuntu/maverick/bzr/maverick

« back to all changes in this revision

Viewing changes to bzrlib/_known_graph_pyx.c

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2010-03-24 22:27:38 UTC
  • mfrom: (1.4.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20100324222738-5lsc0gdzmtcdp1vp
Tags: 2.1.1-1
* Remove bob2 from uploaders. Closes: #573427
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
/* Generated by Pyrex 0.9.8.5 on Thu Jan 21 16:23:13 2010 */
 
1
/* Generated by Pyrex 0.9.8.5 on Wed Mar 24 18:17:26 2010 */
2
2
 
3
3
#define PY_SSIZE_T_CLEAN
4
4
#include "Python.h"
278
278
  Py_INCREF(__pyx_v_self);
279
279
  Py_INCREF(__pyx_v_key);
280
280
 
281
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":74 */
 
281
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":74 */
282
282
  Py_INCREF(__pyx_v_key);
283
283
  Py_DECREF(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->key);
284
284
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->key = __pyx_v_key;
285
285
 
286
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":75 */
 
286
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":75 */
287
287
  Py_INCREF(Py_None);
288
288
  Py_DECREF(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->parents);
289
289
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->parents = Py_None;
290
290
 
291
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":77 */
 
291
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":77 */
292
292
  __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; goto __pyx_L1;}
293
293
  Py_DECREF(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->children);
294
294
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->children = __pyx_1;
295
295
  __pyx_1 = 0;
296
296
 
297
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":79 */
 
297
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":79 */
298
298
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->gdfo = (-1);
299
299
 
300
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":80 */
 
300
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":80 */
301
301
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->seen = 0;
302
302
 
303
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":81 */
 
303
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":81 */
304
304
  Py_INCREF(Py_None);
305
305
  Py_DECREF(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->extra);
306
306
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->extra = Py_None;
329
329
  __pyx_v_child = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None); Py_INCREF(Py_None);
330
330
  __pyx_v_keys = Py_None; Py_INCREF(Py_None);
331
331
 
332
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":87 */
 
332
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":87 */
333
333
  __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; goto __pyx_L1;}
334
334
  Py_DECREF(__pyx_v_keys);
335
335
  __pyx_v_keys = __pyx_1;
336
336
  __pyx_1 = 0;
337
337
 
338
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":88 */
 
338
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":88 */
339
339
  __pyx_1 = PyObject_GetIter(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->children); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; goto __pyx_L1;}
340
340
  for (;;) {
341
341
    __pyx_2 = PyIter_Next(__pyx_1);
351
351
  }
352
352
  Py_DECREF(__pyx_1); __pyx_1 = 0;
353
353
 
354
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":90 */
 
354
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":90 */
355
355
  Py_INCREF(__pyx_v_keys);
356
356
  __pyx_r = __pyx_v_keys;
357
357
  goto __pyx_L0;
382
382
  __pyx_v_parent = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None); Py_INCREF(Py_None);
383
383
  __pyx_v_keys = Py_None; Py_INCREF(Py_None);
384
384
 
385
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":94 */
 
385
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":94 */
386
386
  __pyx_1 = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->parents == Py_None;
387
387
  if (__pyx_1) {
388
388
    Py_INCREF(Py_None);
392
392
  }
393
393
  __pyx_L2:;
394
394
 
395
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":99 */
 
395
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":99 */
396
396
  __pyx_2 = PyList_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; goto __pyx_L1;}
397
397
  Py_DECREF(__pyx_v_keys);
398
398
  __pyx_v_keys = __pyx_2;
399
399
  __pyx_2 = 0;
400
400
 
401
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":100 */
 
401
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":100 */
402
402
  __pyx_2 = PyObject_GetIter(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->parents); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; goto __pyx_L1;}
403
403
  for (;;) {
404
404
    __pyx_3 = PyIter_Next(__pyx_2);
414
414
  }
415
415
  Py_DECREF(__pyx_2); __pyx_2 = 0;
416
416
 
417
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":102 */
 
417
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":102 */
418
418
  Py_INCREF(__pyx_v_keys);
419
419
  __pyx_r = __pyx_v_keys;
420
420
  goto __pyx_L0;
437
437
  PyObject *__pyx_r;
438
438
  Py_INCREF(__pyx_v_self);
439
439
 
440
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":105 */
 
440
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":105 */
441
441
  Py_INCREF(Py_None);
442
442
  Py_DECREF(__pyx_v_self->parents);
443
443
  __pyx_v_self->parents = Py_None;
444
444
 
445
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":106 */
 
445
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":106 */
446
446
  Py_INCREF(Py_None);
447
447
  Py_DECREF(__pyx_v_self->children);
448
448
  __pyx_v_self->children = Py_None;
468
468
  __pyx_v_parent_keys = Py_None; Py_INCREF(Py_None);
469
469
  __pyx_v_child_keys = Py_None; Py_INCREF(Py_None);
470
470
 
471
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":111 */
 
471
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":111 */
472
472
  __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; goto __pyx_L1;}
473
473
  Py_DECREF(__pyx_v_parent_keys);
474
474
  __pyx_v_parent_keys = __pyx_1;
475
475
  __pyx_1 = 0;
476
476
 
477
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":112 */
 
477
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":112 */
478
478
  __pyx_2 = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->parents != Py_None;
479
479
  if (__pyx_2) {
480
480
    __pyx_1 = PyObject_GetIter(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->parents); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; goto __pyx_L1;}
502
502
  }
503
503
  __pyx_L2:;
504
504
 
505
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":115 */
 
505
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":115 */
506
506
  __pyx_3 = PyList_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; goto __pyx_L1;}
507
507
  Py_DECREF(__pyx_v_child_keys);
508
508
  __pyx_v_child_keys = __pyx_3;
509
509
  __pyx_3 = 0;
510
510
 
511
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":116 */
 
511
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":116 */
512
512
  __pyx_2 = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->children != Py_None;
513
513
  if (__pyx_2) {
514
514
    __pyx_4 = PyObject_GetIter(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_self)->children); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; goto __pyx_L1;}
536
536
  }
537
537
  __pyx_L5:;
538
538
 
539
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":119 */
 
539
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":119 */
540
540
  __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n___class__); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;}
541
541
  __pyx_3 = PyObject_GetAttr(__pyx_1, __pyx_n___name__); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;}
542
542
  Py_DECREF(__pyx_1); __pyx_1 = 0;
580
580
  struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *__pyx_r;
581
581
  Py_INCREF(__pyx_v_lst);
582
582
 
583
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":127 */
 
583
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":127 */
584
584
  __pyx_v_temp_node = PyList_GET_ITEM(__pyx_v_lst,__pyx_v_pos);
585
585
 
586
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":128 */
 
586
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":128 */
587
587
  Py_INCREF(((PyObject *)__pyx_v_temp_node));
588
588
  __pyx_r = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_temp_node);
589
589
  goto __pyx_L0;
599
599
  struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *__pyx_r;
600
600
  Py_INCREF(__pyx_v_tpl);
601
601
 
602
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":134 */
 
602
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":134 */
603
603
  __pyx_v_temp_node = PyTuple_GET_ITEM(__pyx_v_tpl,__pyx_v_pos);
604
604
 
605
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":135 */
 
605
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":135 */
606
606
  Py_INCREF(((PyObject *)__pyx_v_temp_node));
607
607
  __pyx_r = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_temp_node);
608
608
  goto __pyx_L0;
623
623
  Py_INCREF(__pyx_v_node);
624
624
  __pyx_v_real_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None); Py_INCREF(Py_None);
625
625
 
626
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":140 */
 
626
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":140 */
627
627
  if (!__Pyx_TypeTest(__pyx_v_node, __pyx_ptype_6bzrlib_16_known_graph_pyx__KnownGraphNode)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; goto __pyx_L1;}
628
628
  Py_INCREF(__pyx_v_node);
629
629
  Py_DECREF(((PyObject *)__pyx_v_real_node));
630
630
  __pyx_v_real_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_node);
631
631
 
632
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":141 */
 
632
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":141 */
633
633
  Py_INCREF(__pyx_v_real_node->key);
634
634
  __pyx_r = __pyx_v_real_node->key;
635
635
  goto __pyx_L0;
663
663
  __pyx_v_node1 = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None); Py_INCREF(Py_None);
664
664
  __pyx_v_node2 = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None); Py_INCREF(Py_None);
665
665
 
666
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":154 */
 
666
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":154 */
667
667
  __pyx_v_is_tuple = PyTuple_CheckExact(__pyx_v_lst_or_tpl);
668
668
 
669
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":155 */
 
669
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":155 */
670
670
  __pyx_1 = __pyx_v_is_tuple;
671
671
  if (!__pyx_1) {
672
672
    __pyx_1 = PyList_CheckExact(__pyx_v_lst_or_tpl);
685
685
  }
686
686
  __pyx_L2:;
687
687
 
688
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":157 */
 
688
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":157 */
689
689
  __pyx_5 = PyObject_Length(__pyx_v_lst_or_tpl); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 157; goto __pyx_L1;}
690
690
  __pyx_v_length = __pyx_5;
691
691
 
692
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":158 */
 
692
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":158 */
693
693
  __pyx_1 = (__pyx_v_length == 0);
694
694
  if (!__pyx_1) {
695
695
    __pyx_1 = (__pyx_v_length == 1);
702
702
  }
703
703
  __pyx_L3:;
704
704
 
705
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":160 */
 
705
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":160 */
706
706
  __pyx_2 = (__pyx_v_length == 2);
707
707
  if (__pyx_2) {
708
708
 
709
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":161 */
 
709
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":161 */
710
710
    __pyx_1 = __pyx_v_is_tuple;
711
711
    if (__pyx_1) {
712
712
 
713
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":162 */
 
713
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":162 */
714
714
      __pyx_3 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_tuple_node(__pyx_v_lst_or_tpl,0)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 162; goto __pyx_L1;}
715
715
      Py_DECREF(((PyObject *)__pyx_v_node1));
716
716
      __pyx_v_node1 = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_3);
717
717
      __pyx_3 = 0;
718
718
 
719
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":163 */
 
719
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":163 */
720
720
      __pyx_4 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_tuple_node(__pyx_v_lst_or_tpl,1)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 163; goto __pyx_L1;}
721
721
      Py_DECREF(((PyObject *)__pyx_v_node2));
722
722
      __pyx_v_node2 = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_4);
725
725
    }
726
726
    /*else*/ {
727
727
 
728
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":165 */
 
728
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":165 */
729
729
      __pyx_3 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_list_node(__pyx_v_lst_or_tpl,0)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 165; goto __pyx_L1;}
730
730
      Py_DECREF(((PyObject *)__pyx_v_node1));
731
731
      __pyx_v_node1 = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_3);
732
732
      __pyx_3 = 0;
733
733
 
734
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":166 */
 
734
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":166 */
735
735
      __pyx_4 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_list_node(__pyx_v_lst_or_tpl,1)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; goto __pyx_L1;}
736
736
      Py_DECREF(((PyObject *)__pyx_v_node2));
737
737
      __pyx_v_node2 = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_4);
739
739
    }
740
740
    __pyx_L5:;
741
741
 
742
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":167 */
 
742
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":167 */
743
743
    __pyx_2 = __pyx_v_reverse;
744
744
    if (__pyx_2) {
745
745
      __pyx_v_do_swap = PyObject_RichCompareBool(__pyx_v_node1->key,__pyx_v_node2->key,Py_LT);
750
750
    }
751
751
    __pyx_L6:;
752
752
 
753
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":171 */
 
753
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":171 */
754
754
    __pyx_1 = (!__pyx_v_do_swap);
755
755
    if (__pyx_1) {
756
756
      Py_INCREF(__pyx_v_lst_or_tpl);
760
760
    }
761
761
    __pyx_L7:;
762
762
 
763
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":173 */
 
763
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":173 */
764
764
    __pyx_2 = __pyx_v_is_tuple;
765
765
    if (__pyx_2) {
766
766
      __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; goto __pyx_L1;}
775
775
    }
776
776
    /*else*/ {
777
777
 
778
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":177 */
 
778
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":177 */
779
779
      Py_INCREF(((PyObject *)__pyx_v_node1));
780
780
 
781
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":178 */
 
781
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":178 */
782
782
      __pyx_1 = PyList_SetItem(__pyx_v_lst_or_tpl,1,((PyObject *)__pyx_v_node1)); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; goto __pyx_L1;}
783
783
 
784
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":179 */
 
784
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":179 */
785
785
      Py_INCREF(((PyObject *)__pyx_v_node2));
786
786
 
787
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":180 */
 
787
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":180 */
788
788
      __pyx_2 = PyList_SetItem(__pyx_v_lst_or_tpl,0,((PyObject *)__pyx_v_node2)); if (__pyx_2 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; goto __pyx_L1;}
789
789
 
790
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":181 */
 
790
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":181 */
791
791
      Py_INCREF(__pyx_v_lst_or_tpl);
792
792
      __pyx_r = __pyx_v_lst_or_tpl;
793
793
      goto __pyx_L0;
797
797
  }
798
798
  __pyx_L4:;
799
799
 
800
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":183 */
 
800
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":183 */
801
801
  __pyx_1 = __pyx_v_is_tuple;
802
802
  if (__pyx_1) {
803
803
    __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; goto __pyx_L1;}
812
812
  }
813
813
  __pyx_L9:;
814
814
 
815
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":186 */
 
815
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":186 */
816
816
  __pyx_4 = PyObject_GetAttr(__pyx_v_lst_or_tpl, __pyx_n_sort); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; goto __pyx_L1;}
817
817
  __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; goto __pyx_L1;}
818
818
  __pyx_6 = PyDict_New(); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; goto __pyx_L1;}
828
828
  Py_DECREF(__pyx_6); __pyx_6 = 0;
829
829
  Py_DECREF(__pyx_7); __pyx_7 = 0;
830
830
 
831
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":187 */
 
831
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":187 */
832
832
  Py_INCREF(__pyx_v_lst_or_tpl);
833
833
  __pyx_r = __pyx_v_lst_or_tpl;
834
834
  goto __pyx_L0;
865
865
  Py_INCREF(__pyx_v_parent_map);
866
866
  Py_INCREF(__pyx_v_do_cache);
867
867
 
868
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":205 */
 
868
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":205 */
869
869
  __pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 205; goto __pyx_L1;}
870
870
  Py_DECREF(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_nodes);
871
871
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_nodes = __pyx_1;
872
872
  __pyx_1 = 0;
873
873
 
874
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":207 */
 
874
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":207 */
875
875
  __pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 207; goto __pyx_L1;}
876
876
  Py_DECREF(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_known_heads);
877
877
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_known_heads = __pyx_1;
878
878
  __pyx_1 = 0;
879
879
 
880
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":208 */
 
880
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":208 */
881
881
  __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 208; goto __pyx_L1;}
882
882
  Py_INCREF(__pyx_v_do_cache);
883
883
  PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_do_cache);
887
887
  Py_DECREF(__pyx_2); __pyx_2 = 0;
888
888
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->do_cache = __pyx_3;
889
889
 
890
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":212 */
 
890
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":212 */
891
891
  __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n__initialize_nodes); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 212; goto __pyx_L1;}
892
892
  __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 212; goto __pyx_L1;}
893
893
  Py_INCREF(__pyx_v_parent_map);
897
897
  Py_DECREF(__pyx_2); __pyx_2 = 0;
898
898
  Py_DECREF(__pyx_4); __pyx_4 = 0;
899
899
 
900
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":213 */
 
900
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":213 */
901
901
  __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n__find_gdfo); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;}
902
902
  __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;}
903
903
  Py_DECREF(__pyx_1); __pyx_1 = 0;
928
928
  Py_INCREF(__pyx_v_self);
929
929
  __pyx_v_child = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None); Py_INCREF(Py_None);
930
930
 
931
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":220 */
 
931
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":220 */
932
932
  while (1) {
933
933
    __pyx_1 = PyDict_Next(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_nodes,(&__pyx_v_pos),NULL,(&__pyx_v_temp_node));
934
934
    if (!__pyx_1) break;
935
935
 
936
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":221 */
 
936
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":221 */
937
937
    Py_INCREF(((PyObject *)__pyx_v_temp_node));
938
938
    Py_DECREF(((PyObject *)__pyx_v_child));
939
939
    __pyx_v_child = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_temp_node);
940
940
 
941
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":222 */
 
941
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":222 */
942
942
    __pyx_2 = ((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_child->__pyx_vtab)->clear_references(__pyx_v_child); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 222; goto __pyx_L1;}
943
943
    Py_DECREF(__pyx_2); __pyx_2 = 0;
944
944
  }
963
963
  Py_INCREF(__pyx_v_key);
964
964
  __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None); Py_INCREF(Py_None);
965
965
 
966
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":228 */
 
966
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":228 */
967
967
  __pyx_v_temp_node = PyDict_GetItem(__pyx_v_self->_nodes,__pyx_v_key);
968
968
 
969
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":229 */
 
969
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":229 */
970
970
  __pyx_1 = (__pyx_v_temp_node == NULL);
971
971
  if (__pyx_1) {
972
972
 
973
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":230 */
 
973
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":230 */
974
974
    __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; goto __pyx_L1;}
975
975
    Py_INCREF(__pyx_v_key);
976
976
    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_key);
980
980
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_3);
981
981
    __pyx_3 = 0;
982
982
 
983
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":231 */
 
983
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":231 */
984
984
    __pyx_1 = PyDict_SetItem(__pyx_v_self->_nodes,__pyx_v_key,((PyObject *)__pyx_v_node)); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; goto __pyx_L1;}
985
985
    goto __pyx_L2;
986
986
  }
991
991
  }
992
992
  __pyx_L2:;
993
993
 
994
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":234 */
 
994
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":234 */
995
995
  Py_INCREF(((PyObject *)__pyx_v_node));
996
996
  __pyx_r = __pyx_v_node;
997
997
  goto __pyx_L0;
1026
1026
  __pyx_v_parent_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None); Py_INCREF(Py_None);
1027
1027
  __pyx_v_parent_nodes = Py_None; Py_INCREF(Py_None);
1028
1028
 
1029
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":240 */
 
1029
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":240 */
1030
1030
  __pyx_1 = PyObject_Length(__pyx_v_parent_keys); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 240; goto __pyx_L1;}
1031
1031
  __pyx_v_num_parent_keys = __pyx_1;
1032
1032
 
1033
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":242 */
 
1033
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":242 */
1034
1034
  __pyx_2 = PyTuple_New(__pyx_v_num_parent_keys); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 242; goto __pyx_L1;}
1035
1035
  Py_DECREF(__pyx_v_parent_nodes);
1036
1036
  __pyx_v_parent_nodes = __pyx_2;
1037
1037
  __pyx_2 = 0;
1038
1038
 
1039
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":243 */
 
1039
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":243 */
1040
1040
  for (__pyx_v_pos = 0; __pyx_v_pos < __pyx_v_num_parent_keys; ++__pyx_v_pos) {
1041
1041
 
1042
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":251 */
 
1042
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":251 */
1043
1043
    __pyx_2 = __Pyx_GetItemInt(__pyx_v_parent_keys, __pyx_v_pos); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; goto __pyx_L1;}
1044
1044
    __pyx_3 = ((PyObject *)((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self->__pyx_vtab)->_get_or_create_node(__pyx_v_self,__pyx_2)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; goto __pyx_L1;}
1045
1045
    Py_DECREF(__pyx_2); __pyx_2 = 0;
1047
1047
    __pyx_v_parent_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_3);
1048
1048
    __pyx_3 = 0;
1049
1049
 
1050
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":253 */
 
1050
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":253 */
1051
1051
    Py_INCREF(((PyObject *)__pyx_v_parent_node));
1052
1052
 
1053
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":254 */
 
1053
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":254 */
1054
1054
    PyTuple_SET_ITEM(__pyx_v_parent_nodes,__pyx_v_pos,((PyObject *)__pyx_v_parent_node));
1055
1055
 
1056
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":255 */
 
1056
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":255 */
1057
1057
    __pyx_4 = PyList_Append(__pyx_v_parent_node->children,((PyObject *)__pyx_v_node)); if (__pyx_4 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; goto __pyx_L1;}
1058
1058
  }
1059
1059
 
1060
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":256 */
 
1060
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":256 */
1061
1061
  Py_INCREF(__pyx_v_parent_nodes);
1062
1062
  Py_DECREF(__pyx_v_node->parents);
1063
1063
  __pyx_v_node->parents = __pyx_v_parent_nodes;
1100
1100
  __pyx_v_key = Py_None; Py_INCREF(Py_None);
1101
1101
  __pyx_v_parent_keys = Py_None; Py_INCREF(Py_None);
1102
1102
 
1103
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":272 */
 
1103
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":272 */
1104
1104
  __pyx_1 = (!PyDict_CheckExact(__pyx_v_parent_map));
1105
1105
  if (__pyx_1) {
1106
1106
    __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 273; goto __pyx_L1;}
1115
1115
  }
1116
1116
  __pyx_L2:;
1117
1117
 
1118
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":275 */
 
1118
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":275 */
1119
1119
  __pyx_v_pos = 0;
1120
1120
 
1121
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":276 */
 
1121
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":276 */
1122
1122
  while (1) {
1123
1123
    __pyx_1 = PyDict_Next(__pyx_v_parent_map,(&__pyx_v_pos),(&__pyx_v_temp_key),(&__pyx_v_temp_parent_keys));
1124
1124
    if (!__pyx_1) break;
1125
1125
 
1126
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":277 */
 
1126
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":277 */
1127
1127
    Py_INCREF(((PyObject *)__pyx_v_temp_key));
1128
1128
    Py_DECREF(__pyx_v_key);
1129
1129
    __pyx_v_key = ((PyObject *)__pyx_v_temp_key);
1130
1130
 
1131
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":278 */
 
1131
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":278 */
1132
1132
    Py_INCREF(((PyObject *)__pyx_v_temp_parent_keys));
1133
1133
    Py_DECREF(__pyx_v_parent_keys);
1134
1134
    __pyx_v_parent_keys = ((PyObject *)__pyx_v_temp_parent_keys);
1135
1135
 
1136
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":279 */
 
1136
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":279 */
1137
1137
    __pyx_2 = ((PyObject *)((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx_KnownGraph *)((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->__pyx_vtab)->_get_or_create_node(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self),__pyx_v_key)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; goto __pyx_L1;}
1138
1138
    Py_DECREF(((PyObject *)__pyx_v_node));
1139
1139
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_2);
1140
1140
    __pyx_2 = 0;
1141
1141
 
1142
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":280 */
 
1142
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":280 */
1143
1143
    __pyx_3 = ((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx_KnownGraph *)((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->__pyx_vtab)->_populate_parents(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self),__pyx_v_node,__pyx_v_parent_keys); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; goto __pyx_L1;}
1144
1144
    Py_DECREF(__pyx_3); __pyx_3 = 0;
1145
1145
  }
1175
1175
  __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None); Py_INCREF(Py_None);
1176
1176
  __pyx_v_tails = Py_None; Py_INCREF(Py_None);
1177
1177
 
1178
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":287 */
 
1178
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":287 */
1179
1179
  __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 287; goto __pyx_L1;}
1180
1180
  Py_DECREF(__pyx_v_tails);
1181
1181
  __pyx_v_tails = __pyx_1;
1182
1182
  __pyx_1 = 0;
1183
1183
 
1184
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":288 */
 
1184
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":288 */
1185
1185
  __pyx_v_pos = 0;
1186
1186
 
1187
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":289 */
 
1187
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":289 */
1188
1188
  while (1) {
1189
1189
    __pyx_2 = PyDict_Next(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_nodes,(&__pyx_v_pos),NULL,(&__pyx_v_temp_node));
1190
1190
    if (!__pyx_2) break;
1191
1191
 
1192
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":290 */
 
1192
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":290 */
1193
1193
    Py_INCREF(((PyObject *)__pyx_v_temp_node));
1194
1194
    Py_DECREF(((PyObject *)__pyx_v_node));
1195
1195
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_temp_node);
1196
1196
 
1197
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":291 */
 
1197
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":291 */
1198
1198
    __pyx_2 = __pyx_v_node->parents == Py_None;
1199
1199
    if (!__pyx_2) {
1200
1200
      __pyx_2 = (PyTuple_GET_SIZE(__pyx_v_node->parents) == 0);
1201
1201
    }
1202
1202
    if (__pyx_2) {
1203
1203
 
1204
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":292 */
 
1204
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":292 */
1205
1205
      __pyx_v_node->gdfo = 1;
1206
1206
 
1207
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":293 */
 
1207
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":293 */
1208
1208
      __pyx_2 = PyList_Append(__pyx_v_tails,((PyObject *)__pyx_v_node)); if (__pyx_2 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; goto __pyx_L1;}
1209
1209
      goto __pyx_L4;
1210
1210
    }
1211
1211
    __pyx_L4:;
1212
1212
  }
1213
1213
 
1214
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":294 */
 
1214
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":294 */
1215
1215
  Py_INCREF(__pyx_v_tails);
1216
1216
  __pyx_r = __pyx_v_tails;
1217
1217
  goto __pyx_L0;
1244
1244
  __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None); Py_INCREF(Py_None);
1245
1245
  __pyx_v_tips = Py_None; Py_INCREF(Py_None);
1246
1246
 
1247
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":301 */
 
1247
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":301 */
1248
1248
  __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 301; goto __pyx_L1;}
1249
1249
  Py_DECREF(__pyx_v_tips);
1250
1250
  __pyx_v_tips = __pyx_1;
1251
1251
  __pyx_1 = 0;
1252
1252
 
1253
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":302 */
 
1253
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":302 */
1254
1254
  __pyx_v_pos = 0;
1255
1255
 
1256
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":303 */
 
1256
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":303 */
1257
1257
  while (1) {
1258
1258
    __pyx_2 = PyDict_Next(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_nodes,(&__pyx_v_pos),NULL,(&__pyx_v_temp_node));
1259
1259
    if (!__pyx_2) break;
1260
1260
 
1261
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":304 */
 
1261
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":304 */
1262
1262
    Py_INCREF(((PyObject *)__pyx_v_temp_node));
1263
1263
    Py_DECREF(((PyObject *)__pyx_v_node));
1264
1264
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_temp_node);
1265
1265
 
1266
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":305 */
 
1266
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":305 */
1267
1267
    __pyx_2 = (PyList_GET_SIZE(__pyx_v_node->children) == 0);
1268
1268
    if (__pyx_2) {
1269
1269
      __pyx_2 = PyList_Append(__pyx_v_tips,((PyObject *)__pyx_v_node)); if (__pyx_2 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 306; goto __pyx_L1;}
1272
1272
    __pyx_L4:;
1273
1273
  }
1274
1274
 
1275
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":307 */
 
1275
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":307 */
1276
1276
  Py_INCREF(__pyx_v_tips);
1277
1277
  __pyx_r = __pyx_v_tips;
1278
1278
  goto __pyx_L0;
1310
1310
  __pyx_v_child = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None); Py_INCREF(Py_None);
1311
1311
  __pyx_v_pending = Py_None; Py_INCREF(Py_None);
1312
1312
 
1313
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":318 */
 
1313
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":318 */
1314
1314
  __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n__find_tails); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; goto __pyx_L1;}
1315
1315
  __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; goto __pyx_L1;}
1316
1316
  Py_DECREF(__pyx_1); __pyx_1 = 0;
1318
1318
  __pyx_v_pending = __pyx_2;
1319
1319
  __pyx_2 = 0;
1320
1320
 
1321
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":320 */
 
1321
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":320 */
1322
1322
  __pyx_v_last_item = (PyList_GET_SIZE(__pyx_v_pending) - 1);
1323
1323
 
1324
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":321 */
 
1324
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":321 */
1325
1325
  while (1) {
1326
1326
    __pyx_3 = (__pyx_v_last_item >= 0);
1327
1327
    if (!__pyx_3) break;
1328
1328
 
1329
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":324 */
 
1329
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":324 */
1330
1330
    __pyx_1 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_list_node(__pyx_v_pending,__pyx_v_last_item)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 324; goto __pyx_L1;}
1331
1331
    Py_DECREF(((PyObject *)__pyx_v_node));
1332
1332
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_1);
1333
1333
    __pyx_1 = 0;
1334
1334
 
1335
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":325 */
 
1335
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":325 */
1336
1336
    __pyx_v_last_item = (__pyx_v_last_item - 1);
1337
1337
 
1338
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":326 */
 
1338
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":326 */
1339
1339
    __pyx_v_next_gdfo = (__pyx_v_node->gdfo + 1);
1340
1340
 
1341
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":327 */
 
1341
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":327 */
1342
1342
    __pyx_4 = PyList_GET_SIZE(__pyx_v_node->children);
1343
1343
    for (__pyx_v_pos = 0; __pyx_v_pos < __pyx_4; ++__pyx_v_pos) {
1344
1344
 
1345
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":328 */
 
1345
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":328 */
1346
1346
      __pyx_2 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_list_node(__pyx_v_node->children,__pyx_v_pos)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 328; goto __pyx_L1;}
1347
1347
      Py_DECREF(((PyObject *)__pyx_v_child));
1348
1348
      __pyx_v_child = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_2);
1349
1349
      __pyx_2 = 0;
1350
1350
 
1351
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":329 */
 
1351
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":329 */
1352
1352
      __pyx_3 = (__pyx_v_next_gdfo > __pyx_v_child->gdfo);
1353
1353
      if (__pyx_3) {
1354
1354
        __pyx_v_child->gdfo = __pyx_v_next_gdfo;
1356
1356
      }
1357
1357
      __pyx_L6:;
1358
1358
 
1359
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":331 */
 
1359
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":331 */
1360
1360
      __pyx_v_child->seen = (__pyx_v_child->seen + 1);
1361
1361
 
1362
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":332 */
 
1362
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":332 */
1363
1363
      __pyx_3 = (__pyx_v_child->seen == PyTuple_GET_SIZE(__pyx_v_child->parents));
1364
1364
      if (__pyx_3) {
1365
1365
 
1366
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":334 */
 
1366
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":334 */
1367
1367
        __pyx_v_last_item = (__pyx_v_last_item + 1);
1368
1368
 
1369
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":335 */
 
1369
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":335 */
1370
1370
        __pyx_3 = (__pyx_v_last_item < PyList_GET_SIZE(__pyx_v_pending));
1371
1371
        if (__pyx_3) {
1372
1372
 
1373
 
          /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":336 */
 
1373
          /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":336 */
1374
1374
          Py_INCREF(((PyObject *)__pyx_v_child));
1375
1375
 
1376
 
          /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":337 */
 
1376
          /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":337 */
1377
1377
          __pyx_3 = PyList_SetItem(__pyx_v_pending,__pyx_v_last_item,((PyObject *)__pyx_v_child)); if (__pyx_3 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; goto __pyx_L1;}
1378
1378
          goto __pyx_L8;
1379
1379
        }
1382
1382
        }
1383
1383
        __pyx_L8:;
1384
1384
 
1385
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":342 */
 
1385
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":342 */
1386
1386
        __pyx_v_child->seen = 0;
1387
1387
        goto __pyx_L7;
1388
1388
      }
1439
1439
  __pyx_v_pending_popleft = Py_None; Py_INCREF(Py_None);
1440
1440
  __pyx_v_pending_append = Py_None; Py_INCREF(Py_None);
1441
1441
 
1442
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":359 */
 
1442
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":359 */
1443
1443
  __pyx_v_maybe_node = PyDict_GetItem(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_nodes,__pyx_v_key);
1444
1444
 
1445
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":360 */
 
1445
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":360 */
1446
1446
  __pyx_1 = (__pyx_v_maybe_node != NULL);
1447
1447
  if (__pyx_1) {
1448
1448
 
1449
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":361 */
 
1449
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":361 */
1450
1450
    Py_INCREF(((PyObject *)__pyx_v_maybe_node));
1451
1451
    Py_DECREF(((PyObject *)__pyx_v_node));
1452
1452
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_maybe_node);
1453
1453
 
1454
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":362 */
 
1454
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":362 */
1455
1455
    __pyx_1 = __pyx_v_node->parents == Py_None;
1456
1456
    if (__pyx_1) {
1457
1457
 
1458
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":364 */
 
1458
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":364 */
1459
1459
      __pyx_2 = ((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx_KnownGraph *)((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->__pyx_vtab)->_populate_parents(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self),__pyx_v_node,__pyx_v_parent_keys); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; goto __pyx_L1;}
1460
1460
      Py_DECREF(__pyx_2); __pyx_2 = 0;
1461
1461
 
1462
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":366 */
 
1462
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":366 */
1463
1463
      __pyx_2 = PyObject_GetAttr(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_known_heads, __pyx_n_clear); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 366; goto __pyx_L1;}
1464
1464
      __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 366; goto __pyx_L1;}
1465
1465
      Py_DECREF(__pyx_2); __pyx_2 = 0;
1468
1468
    }
1469
1469
    /*else*/ {
1470
1470
 
1471
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":368 */
 
1471
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":368 */
1472
1472
      __pyx_2 = PyList_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 368; goto __pyx_L1;}
1473
1473
      Py_DECREF(__pyx_v_existing_parent_keys);
1474
1474
      __pyx_v_existing_parent_keys = __pyx_2;
1475
1475
      __pyx_2 = 0;
1476
1476
 
1477
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":369 */
 
1477
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":369 */
1478
1478
      __pyx_3 = PyObject_GetIter(__pyx_v_node->parents); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 369; goto __pyx_L1;}
1479
1479
      for (;;) {
1480
1480
        __pyx_2 = PyIter_Next(__pyx_3);
1497
1497
      }
1498
1498
      Py_DECREF(__pyx_3); __pyx_3 = 0;
1499
1499
 
1500
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":373 */
 
1500
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":373 */
1501
1501
      __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 373; goto __pyx_L1;}
1502
1502
      Py_INCREF(__pyx_v_parent_keys);
1503
1503
      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_parent_keys);
1507
1507
      __pyx_v_parent_keys = __pyx_4;
1508
1508
      __pyx_4 = 0;
1509
1509
 
1510
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":374 */
 
1510
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":374 */
1511
1511
      if (PyObject_Cmp(__pyx_v_existing_parent_keys, __pyx_v_parent_keys, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 374; goto __pyx_L1;}
1512
1512
      __pyx_1 = __pyx_1 == 0;
1513
1513
      if (__pyx_1) {
1541
1541
  }
1542
1542
  /*else*/ {
1543
1543
 
1544
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":382 */
 
1544
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":382 */
1545
1545
    __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 382; goto __pyx_L1;}
1546
1546
    Py_INCREF(__pyx_v_key);
1547
1547
    PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_key);
1551
1551
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_3);
1552
1552
    __pyx_3 = 0;
1553
1553
 
1554
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":383 */
 
1554
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":383 */
1555
1555
    __pyx_1 = PyDict_SetItem(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_nodes,__pyx_v_key,((PyObject *)__pyx_v_node)); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 383; goto __pyx_L1;}
1556
1556
 
1557
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":384 */
 
1557
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":384 */
1558
1558
    __pyx_2 = ((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx_KnownGraph *)((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->__pyx_vtab)->_populate_parents(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self),__pyx_v_node,__pyx_v_parent_keys); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 384; goto __pyx_L1;}
1559
1559
    Py_DECREF(__pyx_2); __pyx_2 = 0;
1560
1560
  }
1561
1561
  __pyx_L2:;
1562
1562
 
1563
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":385 */
 
1563
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":385 */
1564
1564
  __pyx_v_parent_gdfo = 0;
1565
1565
 
1566
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":386 */
 
1566
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":386 */
1567
1567
  __pyx_4 = PyObject_GetIter(__pyx_v_node->parents); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 386; goto __pyx_L1;}
1568
1568
  for (;;) {
1569
1569
    __pyx_5 = PyIter_Next(__pyx_4);
1576
1576
    __pyx_v_parent_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_5);
1577
1577
    __pyx_5 = 0;
1578
1578
 
1579
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":387 */
 
1579
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":387 */
1580
1580
    __pyx_1 = (__pyx_v_parent_node->gdfo == (-1));
1581
1581
    if (__pyx_1) {
1582
1582
      __pyx_v_parent_node->gdfo = 1;
1584
1584
    }
1585
1585
    __pyx_L9:;
1586
1586
 
1587
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":390 */
 
1587
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":390 */
1588
1588
    __pyx_1 = (__pyx_v_parent_gdfo < __pyx_v_parent_node->gdfo);
1589
1589
    if (__pyx_1) {
1590
1590
      __pyx_v_parent_gdfo = __pyx_v_parent_node->gdfo;
1594
1594
  }
1595
1595
  Py_DECREF(__pyx_4); __pyx_4 = 0;
1596
1596
 
1597
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":392 */
 
1597
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":392 */
1598
1598
  __pyx_v_node->gdfo = (__pyx_v_parent_gdfo + 1);
1599
1599
 
1600
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":401 */
 
1600
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":401 */
1601
1601
  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_deque); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 401; goto __pyx_L1;}
1602
1602
  __pyx_2 = PyList_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 401; goto __pyx_L1;}
1603
1603
  Py_INCREF(((PyObject *)__pyx_v_node));
1612
1612
  __pyx_v_pending = __pyx_4;
1613
1613
  __pyx_4 = 0;
1614
1614
 
1615
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":402 */
 
1615
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":402 */
1616
1616
  __pyx_2 = PyObject_GetAttr(__pyx_v_pending, __pyx_n_popleft); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 402; goto __pyx_L1;}
1617
1617
  Py_DECREF(__pyx_v_pending_popleft);
1618
1618
  __pyx_v_pending_popleft = __pyx_2;
1619
1619
  __pyx_2 = 0;
1620
1620
 
1621
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":403 */
 
1621
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":403 */
1622
1622
  __pyx_3 = PyObject_GetAttr(__pyx_v_pending, __pyx_n_append); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 403; goto __pyx_L1;}
1623
1623
  Py_DECREF(__pyx_v_pending_append);
1624
1624
  __pyx_v_pending_append = __pyx_3;
1625
1625
  __pyx_3 = 0;
1626
1626
 
1627
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":404 */
 
1627
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":404 */
1628
1628
  while (1) {
1629
1629
    __pyx_1 = PyObject_IsTrue(__pyx_v_pending); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 404; goto __pyx_L1;}
1630
1630
    if (!__pyx_1) break;
1631
1631
 
1632
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":405 */
 
1632
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":405 */
1633
1633
    __pyx_5 = PyObject_CallObject(__pyx_v_pending_popleft, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 405; goto __pyx_L1;}
1634
1634
    if (!__Pyx_TypeTest(__pyx_5, __pyx_ptype_6bzrlib_16_known_graph_pyx__KnownGraphNode)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 405; goto __pyx_L1;}
1635
1635
    Py_DECREF(((PyObject *)__pyx_v_node));
1636
1636
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_5);
1637
1637
    __pyx_5 = 0;
1638
1638
 
1639
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":406 */
 
1639
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":406 */
1640
1640
    __pyx_v_next_gdfo = (__pyx_v_node->gdfo + 1);
1641
1641
 
1642
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":407 */
 
1642
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":407 */
1643
1643
    __pyx_4 = PyObject_GetIter(__pyx_v_node->children); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 407; goto __pyx_L1;}
1644
1644
    for (;;) {
1645
1645
      __pyx_2 = PyIter_Next(__pyx_4);
1654
1654
      __pyx_1 = (__pyx_v_child_node->gdfo < __pyx_v_next_gdfo);
1655
1655
      if (__pyx_1) {
1656
1656
 
1657
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":411 */
 
1657
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":411 */
1658
1658
        __pyx_v_child_node->gdfo = __pyx_v_next_gdfo;
1659
1659
 
1660
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":412 */
 
1660
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":412 */
1661
1661
        __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 412; goto __pyx_L1;}
1662
1662
        Py_INCREF(((PyObject *)__pyx_v_child_node));
1663
1663
        PyTuple_SET_ITEM(__pyx_3, 0, ((PyObject *)__pyx_v_child_node));
1732
1732
  __pyx_v_parent_node = Py_None; Py_INCREF(Py_None);
1733
1733
  __pyx_v_heads = Py_None; Py_INCREF(Py_None);
1734
1734
 
1735
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":435 */
 
1735
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":435 */
1736
1736
  __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_frozenset); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 435; goto __pyx_L1;}
1737
1737
  __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 435; goto __pyx_L1;}
1738
1738
  Py_INCREF(__pyx_v_keys);
1744
1744
  __pyx_v_heads_key = __pyx_3;
1745
1745
  __pyx_3 = 0;
1746
1746
 
1747
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":436 */
 
1747
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":436 */
1748
1748
  __pyx_v_maybe_heads = PyDict_GetItem(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_known_heads,__pyx_v_heads_key);
1749
1749
 
1750
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":437 */
 
1750
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":437 */
1751
1751
  __pyx_4 = (__pyx_v_maybe_heads != NULL);
1752
1752
  if (__pyx_4) {
1753
1753
    Py_INCREF(((PyObject *)__pyx_v_maybe_heads));
1757
1757
  }
1758
1758
  __pyx_L2:;
1759
1759
 
1760
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":440 */
 
1760
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":440 */
1761
1761
  __pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 440; goto __pyx_L1;}
1762
1762
  Py_DECREF(__pyx_v_candidate_nodes);
1763
1763
  __pyx_v_candidate_nodes = __pyx_1;
1764
1764
  __pyx_1 = 0;
1765
1765
 
1766
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":441 */
 
1766
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":441 */
1767
1767
  __pyx_2 = PyObject_GetIter(__pyx_v_keys); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 441; goto __pyx_L1;}
1768
1768
  for (;;) {
1769
1769
    __pyx_3 = PyIter_Next(__pyx_2);
1775
1775
    __pyx_v_key = __pyx_3;
1776
1776
    __pyx_3 = 0;
1777
1777
 
1778
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":442 */
 
1778
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":442 */
1779
1779
    __pyx_v_maybe_node = PyDict_GetItem(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_nodes,__pyx_v_key);
1780
1780
 
1781
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":443 */
 
1781
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":443 */
1782
1782
    __pyx_4 = (__pyx_v_maybe_node == NULL);
1783
1783
    if (__pyx_4) {
1784
1784
      __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 444; goto __pyx_L1;}
1798
1798
    }
1799
1799
    __pyx_L5:;
1800
1800
 
1801
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":445 */
 
1801
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":445 */
1802
1802
    __pyx_4 = PyDict_SetItem(__pyx_v_candidate_nodes,__pyx_v_key,((PyObject *)__pyx_v_maybe_node)); if (__pyx_4 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 445; goto __pyx_L1;}
1803
1803
  }
1804
1804
  Py_DECREF(__pyx_2); __pyx_2 = 0;
1805
1805
 
1806
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":446 */
 
1806
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":446 */
1807
1807
  __pyx_v_maybe_node = PyDict_GetItem(__pyx_v_candidate_nodes,__pyx_v_6bzrlib_16_known_graph_pyx_NULL_REVISION);
1808
1808
 
1809
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":447 */
 
1809
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":447 */
1810
1810
  __pyx_4 = (__pyx_v_maybe_node != NULL);
1811
1811
  if (__pyx_4) {
1812
1812
 
1813
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":449 */
 
1813
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":449 */
1814
1814
    __pyx_1 = PyObject_GetAttr(__pyx_v_candidate_nodes, __pyx_n_pop); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 449; goto __pyx_L1;}
1815
1815
    __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 449; goto __pyx_L1;}
1816
1816
    Py_INCREF(__pyx_v_6bzrlib_16_known_graph_pyx_NULL_REVISION);
1820
1820
    Py_DECREF(__pyx_3); __pyx_3 = 0;
1821
1821
    Py_DECREF(__pyx_2); __pyx_2 = 0;
1822
1822
 
1823
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":450 */
 
1823
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":450 */
1824
1824
    __pyx_4 = PyObject_IsTrue(__pyx_v_candidate_nodes); if (__pyx_4 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 450; goto __pyx_L1;}
1825
1825
    __pyx_5 = (!__pyx_4);
1826
1826
    if (__pyx_5) {
1841
1841
    }
1842
1842
    __pyx_L7:;
1843
1843
 
1844
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":453 */
 
1844
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":453 */
1845
1845
    __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_frozenset); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 453; goto __pyx_L1;}
1846
1846
    __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 453; goto __pyx_L1;}
1847
1847
    Py_INCREF(__pyx_v_candidate_nodes);
1856
1856
  }
1857
1857
  __pyx_L6:;
1858
1858
 
1859
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":454 */
 
1859
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":454 */
1860
1860
  __pyx_6 = PyDict_Size(__pyx_v_candidate_nodes); if (__pyx_6 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 454; goto __pyx_L1;}
1861
1861
  __pyx_4 = (__pyx_6 < 2);
1862
1862
  if (__pyx_4) {
1867
1867
  }
1868
1868
  __pyx_L8:;
1869
1869
 
1870
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":457 */
 
1870
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":457 */
1871
1871
  __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 457; goto __pyx_L1;}
1872
1872
  Py_DECREF(__pyx_v_cleanup);
1873
1873
  __pyx_v_cleanup = __pyx_1;
1874
1874
  __pyx_1 = 0;
1875
1875
 
1876
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":458 */
 
1876
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":458 */
1877
1877
  __pyx_2 = PyList_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 458; goto __pyx_L1;}
1878
1878
  Py_DECREF(__pyx_v_pending);
1879
1879
  __pyx_v_pending = __pyx_2;
1880
1880
  __pyx_2 = 0;
1881
1881
 
1882
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":460 */
 
1882
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":460 */
1883
1883
  __pyx_6 = PyDict_Size(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_nodes); if (__pyx_6 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 460; goto __pyx_L1;}
1884
1884
  __pyx_v_min_gdfo = (__pyx_6 + 1);
1885
1885
 
1886
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":463 */
 
1886
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":463 */
1887
1887
  __pyx_v_pos = 0;
1888
1888
 
1889
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":464 */
 
1889
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":464 */
1890
1890
  while (1) {
1891
1891
    __pyx_5 = PyDict_Next(__pyx_v_candidate_nodes,(&__pyx_v_pos),NULL,(&__pyx_v_temp_node));
1892
1892
    if (!__pyx_5) break;
1893
1893
 
1894
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":465 */
 
1894
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":465 */
1895
1895
    Py_INCREF(((PyObject *)__pyx_v_temp_node));
1896
1896
    Py_DECREF(((PyObject *)__pyx_v_node));
1897
1897
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_temp_node);
1898
1898
 
1899
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":466 */
 
1899
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":466 */
1900
1900
    __pyx_4 = __pyx_v_node->parents != Py_None;
1901
1901
    if (__pyx_4) {
1902
1902
      __pyx_3 = PyObject_GetAttr(__pyx_v_pending, __pyx_n_extend); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 467; goto __pyx_L1;}
1911
1911
    }
1912
1912
    __pyx_L11:;
1913
1913
 
1914
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":468 */
 
1914
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":468 */
1915
1915
    __pyx_5 = (__pyx_v_node->gdfo < __pyx_v_min_gdfo);
1916
1916
    if (__pyx_5) {
1917
1917
      __pyx_v_min_gdfo = __pyx_v_node->gdfo;
1920
1920
    __pyx_L12:;
1921
1921
  }
1922
1922
 
1923
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":472 */
 
1923
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":472 */
1924
1924
  __pyx_v_last_item = (PyList_GET_SIZE(__pyx_v_pending) - 1);
1925
1925
 
1926
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":473 */
 
1926
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":473 */
1927
1927
  while (1) {
1928
1928
    __pyx_4 = (__pyx_v_last_item >= 0);
1929
1929
    if (!__pyx_4) break;
1930
1930
 
1931
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":474 */
 
1931
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":474 */
1932
1932
    __pyx_3 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_list_node(__pyx_v_pending,__pyx_v_last_item)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 474; goto __pyx_L1;}
1933
1933
    Py_DECREF(((PyObject *)__pyx_v_node));
1934
1934
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_3);
1935
1935
    __pyx_3 = 0;
1936
1936
 
1937
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":475 */
 
1937
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":475 */
1938
1938
    __pyx_v_last_item = (__pyx_v_last_item - 1);
1939
1939
 
1940
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":476 */
 
1940
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":476 */
1941
1941
    __pyx_5 = __pyx_v_node->seen;
1942
1942
    if (__pyx_5) {
1943
1943
      goto __pyx_L13;
1945
1945
    }
1946
1946
    __pyx_L15:;
1947
1947
 
1948
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":479 */
 
1948
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":479 */
1949
1949
    __pyx_4 = PyList_Append(__pyx_v_cleanup,((PyObject *)__pyx_v_node)); if (__pyx_4 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 479; goto __pyx_L1;}
1950
1950
 
1951
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":480 */
 
1951
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":480 */
1952
1952
    __pyx_v_node->seen = 1;
1953
1953
 
1954
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":481 */
 
1954
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":481 */
1955
1955
    __pyx_5 = (__pyx_v_node->gdfo <= __pyx_v_min_gdfo);
1956
1956
    if (__pyx_5) {
1957
1957
      goto __pyx_L13;
1959
1959
    }
1960
1960
    __pyx_L16:;
1961
1961
 
1962
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":483 */
 
1962
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":483 */
1963
1963
    __pyx_4 = __pyx_v_node->parents != Py_None;
1964
1964
    if (__pyx_4) {
1965
1965
      __pyx_4 = (PyTuple_GET_SIZE(__pyx_v_node->parents) > 0);
1968
1968
      __pyx_6 = PyTuple_GET_SIZE(__pyx_v_node->parents);
1969
1969
      for (__pyx_v_pos = 0; __pyx_v_pos < __pyx_6; ++__pyx_v_pos) {
1970
1970
 
1971
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":485 */
 
1971
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":485 */
1972
1972
        __pyx_1 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_tuple_node(__pyx_v_node->parents,__pyx_v_pos)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 485; goto __pyx_L1;}
1973
1973
        Py_DECREF(__pyx_v_parent_node);
1974
1974
        __pyx_v_parent_node = __pyx_1;
1975
1975
        __pyx_1 = 0;
1976
1976
 
1977
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":486 */
 
1977
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":486 */
1978
1978
        __pyx_v_last_item = (__pyx_v_last_item + 1);
1979
1979
 
1980
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":487 */
 
1980
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":487 */
1981
1981
        __pyx_5 = (__pyx_v_last_item < PyList_GET_SIZE(__pyx_v_pending));
1982
1982
        if (__pyx_5) {
1983
1983
 
1984
 
          /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":488 */
 
1984
          /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":488 */
1985
1985
          Py_INCREF(__pyx_v_parent_node);
1986
1986
 
1987
 
          /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":489 */
 
1987
          /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":489 */
1988
1988
          __pyx_4 = PyList_SetItem(__pyx_v_pending,__pyx_v_last_item,__pyx_v_parent_node); if (__pyx_4 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; goto __pyx_L1;}
1989
1989
          goto __pyx_L20;
1990
1990
        }
1999
1999
    __pyx_L13:;
2000
2000
  }
2001
2001
 
2002
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":492 */
 
2002
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":492 */
2003
2003
  __pyx_2 = PyList_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 492; goto __pyx_L1;}
2004
2004
  Py_DECREF(__pyx_v_heads);
2005
2005
  __pyx_v_heads = __pyx_2;
2006
2006
  __pyx_2 = 0;
2007
2007
 
2008
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":493 */
 
2008
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":493 */
2009
2009
  __pyx_v_pos = 0;
2010
2010
 
2011
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":494 */
 
2011
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":494 */
2012
2012
  while (1) {
2013
2013
    __pyx_4 = PyDict_Next(__pyx_v_candidate_nodes,(&__pyx_v_pos),NULL,(&__pyx_v_temp_node));
2014
2014
    if (!__pyx_4) break;
2015
2015
 
2016
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":495 */
 
2016
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":495 */
2017
2017
    Py_INCREF(((PyObject *)__pyx_v_temp_node));
2018
2018
    Py_DECREF(((PyObject *)__pyx_v_node));
2019
2019
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_v_temp_node);
2020
2020
 
2021
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":496 */
 
2021
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":496 */
2022
2022
    __pyx_5 = (!__pyx_v_node->seen);
2023
2023
    if (__pyx_5) {
2024
2024
      __pyx_4 = PyList_Append(__pyx_v_heads,__pyx_v_node->key); if (__pyx_4 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 497; goto __pyx_L1;}
2027
2027
    __pyx_L23:;
2028
2028
  }
2029
2029
 
2030
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":498 */
 
2030
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":498 */
2031
2031
  __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_frozenset); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 498; goto __pyx_L1;}
2032
2032
  __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 498; goto __pyx_L1;}
2033
2033
  Py_INCREF(__pyx_v_heads);
2039
2039
  __pyx_v_heads = __pyx_2;
2040
2040
  __pyx_2 = 0;
2041
2041
 
2042
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":499 */
 
2042
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":499 */
2043
2043
  __pyx_6 = PyList_GET_SIZE(__pyx_v_cleanup);
2044
2044
  for (__pyx_v_pos = 0; __pyx_v_pos < __pyx_6; ++__pyx_v_pos) {
2045
2045
 
2046
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":500 */
 
2046
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":500 */
2047
2047
    __pyx_3 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_list_node(__pyx_v_cleanup,__pyx_v_pos)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; goto __pyx_L1;}
2048
2048
    Py_DECREF(((PyObject *)__pyx_v_node));
2049
2049
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_3);
2050
2050
    __pyx_3 = 0;
2051
2051
 
2052
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":501 */
 
2052
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":501 */
2053
2053
    __pyx_v_node->seen = 0;
2054
2054
  }
2055
2055
 
2056
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":502 */
 
2056
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":502 */
2057
2057
  __pyx_5 = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->do_cache;
2058
2058
  if (__pyx_5) {
2059
2059
    __pyx_4 = PyDict_SetItem(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_known_heads,__pyx_v_heads_key,__pyx_v_heads); if (__pyx_4 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 503; goto __pyx_L1;}
2061
2061
  }
2062
2062
  __pyx_L26:;
2063
2063
 
2064
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":504 */
 
2064
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":504 */
2065
2065
  Py_INCREF(__pyx_v_heads);
2066
2066
  __pyx_r = __pyx_v_heads;
2067
2067
  goto __pyx_L0;
2111
2111
  __pyx_v_pending = Py_None; Py_INCREF(Py_None);
2112
2112
  __pyx_v_topo_order = Py_None; Py_INCREF(Py_None);
2113
2113
 
2114
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":523 */
 
2114
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":523 */
2115
2115
  __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n__find_tails); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 523; goto __pyx_L1;}
2116
2116
  __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 523; goto __pyx_L1;}
2117
2117
  Py_DECREF(__pyx_1); __pyx_1 = 0;
2119
2119
  __pyx_v_pending = __pyx_2;
2120
2120
  __pyx_2 = 0;
2121
2121
 
2122
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":524 */
 
2122
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":524 */
2123
2123
  __pyx_3 = (PyList_GET_SIZE(__pyx_v_pending) == 0);
2124
2124
  if (__pyx_3) {
2125
2125
    __pyx_4 = PyObject_Length(((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_self)->_nodes); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 524; goto __pyx_L1;}
2142
2142
  }
2143
2143
  __pyx_L2:;
2144
2144
 
2145
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":527 */
 
2145
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":527 */
2146
2146
  __pyx_2 = PyList_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; goto __pyx_L1;}
2147
2147
  Py_DECREF(__pyx_v_topo_order);
2148
2148
  __pyx_v_topo_order = __pyx_2;
2149
2149
  __pyx_2 = 0;
2150
2150
 
2151
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":529 */
 
2151
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":529 */
2152
2152
  __pyx_v_last_item = (PyList_GET_SIZE(__pyx_v_pending) - 1);
2153
2153
 
2154
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":530 */
 
2154
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":530 */
2155
2155
  while (1) {
2156
2156
    __pyx_3 = (__pyx_v_last_item >= 0);
2157
2157
    if (!__pyx_3) break;
2158
2158
 
2159
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":533 */
 
2159
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":533 */
2160
2160
    __pyx_1 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_list_node(__pyx_v_pending,__pyx_v_last_item)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 533; goto __pyx_L1;}
2161
2161
    Py_DECREF(((PyObject *)__pyx_v_node));
2162
2162
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_1);
2163
2163
    __pyx_1 = 0;
2164
2164
 
2165
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":534 */
 
2165
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":534 */
2166
2166
    __pyx_v_last_item = (__pyx_v_last_item - 1);
2167
2167
 
2168
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":535 */
 
2168
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":535 */
2169
2169
    __pyx_3 = __pyx_v_node->parents != Py_None;
2170
2170
    if (__pyx_3) {
2171
2171
      __pyx_3 = PyList_Append(__pyx_v_topo_order,__pyx_v_node->key); if (__pyx_3 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 537; goto __pyx_L1;}
2173
2173
    }
2174
2174
    __pyx_L5:;
2175
2175
 
2176
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":538 */
 
2176
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":538 */
2177
2177
    __pyx_4 = PyList_GET_SIZE(__pyx_v_node->children);
2178
2178
    for (__pyx_v_pos = 0; __pyx_v_pos < __pyx_4; ++__pyx_v_pos) {
2179
2179
 
2180
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":539 */
 
2180
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":539 */
2181
2181
      __pyx_5 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_list_node(__pyx_v_node->children,__pyx_v_pos)); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; goto __pyx_L1;}
2182
2182
      Py_DECREF(((PyObject *)__pyx_v_child));
2183
2183
      __pyx_v_child = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_5);
2184
2184
      __pyx_5 = 0;
2185
2185
 
2186
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":540 */
 
2186
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":540 */
2187
2187
      __pyx_3 = (__pyx_v_child->gdfo == (-1));
2188
2188
      if (__pyx_3) {
2189
2189
        __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_errors); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 543; goto __pyx_L1;}
2202
2202
      }
2203
2203
      __pyx_L8:;
2204
2204
 
2205
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":544 */
 
2205
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":544 */
2206
2206
      __pyx_v_child->seen = (__pyx_v_child->seen + 1);
2207
2207
 
2208
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":545 */
 
2208
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":545 */
2209
2209
      __pyx_3 = (__pyx_v_child->seen == PyTuple_GET_SIZE(__pyx_v_child->parents));
2210
2210
      if (__pyx_3) {
2211
2211
 
2212
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":548 */
 
2212
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":548 */
2213
2213
        __pyx_v_last_item = (__pyx_v_last_item + 1);
2214
2214
 
2215
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":549 */
 
2215
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":549 */
2216
2216
        __pyx_3 = (__pyx_v_last_item < PyList_GET_SIZE(__pyx_v_pending));
2217
2217
        if (__pyx_3) {
2218
2218
 
2219
 
          /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":550 */
 
2219
          /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":550 */
2220
2220
          Py_INCREF(((PyObject *)__pyx_v_child));
2221
2221
 
2222
 
          /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":551 */
 
2222
          /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":551 */
2223
2223
          __pyx_3 = PyList_SetItem(__pyx_v_pending,__pyx_v_last_item,((PyObject *)__pyx_v_child)); if (__pyx_3 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 551; goto __pyx_L1;}
2224
2224
          goto __pyx_L10;
2225
2225
        }
2228
2228
        }
2229
2229
        __pyx_L10:;
2230
2230
 
2231
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":556 */
 
2231
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":556 */
2232
2232
        __pyx_v_child->seen = 0;
2233
2233
        goto __pyx_L9;
2234
2234
      }
2236
2236
    }
2237
2237
  }
2238
2238
 
2239
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":558 */
 
2239
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":558 */
2240
2240
  Py_INCREF(__pyx_v_topo_order);
2241
2241
  __pyx_r = __pyx_v_topo_order;
2242
2242
  goto __pyx_L0;
2293
2293
  __pyx_v_pending = Py_None; Py_INCREF(Py_None);
2294
2294
  __pyx_v_parents = Py_None; Py_INCREF(Py_None);
2295
2295
 
2296
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":575 */
 
2296
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":575 */
2297
2297
  __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n__find_tips); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 575; goto __pyx_L1;}
2298
2298
  __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 575; goto __pyx_L1;}
2299
2299
  Py_DECREF(__pyx_1); __pyx_1 = 0;
2301
2301
  __pyx_v_tips = __pyx_2;
2302
2302
  __pyx_2 = 0;
2303
2303
 
2304
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":577 */
 
2304
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":577 */
2305
2305
  __pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 577; goto __pyx_L1;}
2306
2306
  Py_DECREF(__pyx_v_prefix_tips);
2307
2307
  __pyx_v_prefix_tips = __pyx_1;
2308
2308
  __pyx_1 = 0;
2309
2309
 
2310
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":578 */
 
2310
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":578 */
2311
2311
  __pyx_3 = PyList_GET_SIZE(__pyx_v_tips);
2312
2312
  for (__pyx_v_pos = 0; __pyx_v_pos < __pyx_3; ++__pyx_v_pos) {
2313
2313
 
2314
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":579 */
 
2314
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":579 */
2315
2315
    __pyx_2 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_list_node(__pyx_v_tips,__pyx_v_pos)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 579; goto __pyx_L1;}
2316
2316
    Py_DECREF(((PyObject *)__pyx_v_node));
2317
2317
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_2);
2318
2318
    __pyx_2 = 0;
2319
2319
 
2320
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":580 */
 
2320
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":580 */
2321
2321
    __pyx_4 = PyString_CheckExact(__pyx_v_node->key);
2322
2322
    if (!__pyx_4) {
2323
2323
      __pyx_5 = PyObject_Length(__pyx_v_node->key); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 580; goto __pyx_L1;}
2337
2337
    }
2338
2338
    __pyx_L4:;
2339
2339
 
2340
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":584 */
 
2340
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":584 */
2341
2341
    __pyx_v_temp = PyDict_GetItem(__pyx_v_prefix_tips,__pyx_v_prefix);
2342
2342
 
2343
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":585 */
 
2343
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":585 */
2344
2344
    __pyx_4 = (__pyx_v_temp == NULL);
2345
2345
    if (__pyx_4) {
2346
2346
      __pyx_2 = PyList_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 586; goto __pyx_L1;}
2352
2352
    }
2353
2353
    /*else*/ {
2354
2354
 
2355
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":588 */
 
2355
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":588 */
2356
2356
      Py_INCREF(((PyObject *)__pyx_v_temp));
2357
2357
      Py_DECREF(__pyx_v_tip_nodes);
2358
2358
      __pyx_v_tip_nodes = ((PyObject *)__pyx_v_temp);
2359
2359
 
2360
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":589 */
 
2360
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":589 */
2361
2361
      __pyx_4 = PyList_Append(__pyx_v_tip_nodes,((PyObject *)__pyx_v_node)); if (__pyx_4 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 589; goto __pyx_L1;}
2362
2362
    }
2363
2363
    __pyx_L5:;
2364
2364
  }
2365
2365
 
2366
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":591 */
 
2366
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":591 */
2367
2367
  __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 591; goto __pyx_L1;}
2368
2368
  Py_DECREF(__pyx_v_result);
2369
2369
  __pyx_v_result = __pyx_1;
2370
2370
  __pyx_1 = 0;
2371
2371
 
2372
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":592 */
 
2372
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":592 */
2373
2373
  __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_sorted); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; goto __pyx_L1;}
2374
2374
  __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; goto __pyx_L1;}
2375
2375
  Py_INCREF(__pyx_v_prefix_tips);
2389
2389
    __pyx_v_prefix = __pyx_1;
2390
2390
    __pyx_1 = 0;
2391
2391
 
2392
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":593 */
 
2392
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":593 */
2393
2393
    __pyx_v_temp = PyDict_GetItem(__pyx_v_prefix_tips,__pyx_v_prefix);
2394
2394
 
2395
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":594 */
 
2395
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":594 */
2396
2396
    #ifndef PYREX_WITHOUT_ASSERTIONS
2397
2397
    if (!(__pyx_v_temp != NULL)) {
2398
2398
      PyErr_SetNone(PyExc_AssertionError);
2400
2400
    }
2401
2401
    #endif
2402
2402
 
2403
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":595 */
 
2403
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":595 */
2404
2404
    Py_INCREF(((PyObject *)__pyx_v_temp));
2405
2405
    Py_DECREF(__pyx_v_tip_nodes);
2406
2406
    __pyx_v_tip_nodes = ((PyObject *)__pyx_v_temp);
2407
2407
 
2408
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":596 */
 
2408
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":596 */
2409
2409
    __pyx_6 = __pyx_f_6bzrlib_16_known_graph_pyx__sort_list_nodes(__pyx_v_tip_nodes,1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 596; goto __pyx_L1;}
2410
2410
    Py_DECREF(__pyx_v_pending);
2411
2411
    __pyx_v_pending = __pyx_6;
2412
2412
    __pyx_6 = 0;
2413
2413
 
2414
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":597 */
 
2414
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":597 */
2415
2415
    __pyx_v_last_item = (PyList_GET_SIZE(__pyx_v_pending) - 1);
2416
2416
 
2417
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":598 */
 
2417
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":598 */
2418
2418
    while (1) {
2419
2419
      __pyx_4 = (__pyx_v_last_item >= 0);
2420
2420
      if (!__pyx_4) break;
2421
2421
 
2422
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":599 */
 
2422
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":599 */
2423
2423
      __pyx_1 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_list_node(__pyx_v_pending,__pyx_v_last_item)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 599; goto __pyx_L1;}
2424
2424
      Py_DECREF(((PyObject *)__pyx_v_node));
2425
2425
      __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_1);
2426
2426
      __pyx_1 = 0;
2427
2427
 
2428
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":600 */
 
2428
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":600 */
2429
2429
      __pyx_v_last_item = (__pyx_v_last_item - 1);
2430
2430
 
2431
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":601 */
 
2431
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":601 */
2432
2432
      __pyx_4 = __pyx_v_node->parents == Py_None;
2433
2433
      if (__pyx_4) {
2434
2434
        goto __pyx_L8;
2436
2436
      }
2437
2437
      __pyx_L10:;
2438
2438
 
2439
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":604 */
 
2439
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":604 */
2440
2440
      __pyx_4 = PyList_Append(__pyx_v_result,__pyx_v_node->key); if (__pyx_4 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 604; goto __pyx_L1;}
2441
2441
 
2442
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":611 */
 
2442
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":611 */
2443
2443
      __pyx_6 = __pyx_f_6bzrlib_16_known_graph_pyx__sort_list_nodes(__pyx_v_node->parents,1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 611; goto __pyx_L1;}
2444
2444
      Py_DECREF(__pyx_v_parents);
2445
2445
      __pyx_v_parents = __pyx_6;
2446
2446
      __pyx_6 = 0;
2447
2447
 
2448
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":612 */
 
2448
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":612 */
2449
2449
      __pyx_5 = PyObject_Length(__pyx_v_parents); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 612; goto __pyx_L1;}
2450
2450
      for (__pyx_v_pos = 0; __pyx_v_pos < __pyx_5; ++__pyx_v_pos) {
2451
2451
 
2452
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":613 */
 
2452
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":613 */
2453
2453
        __pyx_4 = PyTuple_CheckExact(__pyx_v_parents);
2454
2454
        if (__pyx_4) {
2455
2455
          __pyx_1 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_tuple_node(__pyx_v_parents,__pyx_v_pos)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 614; goto __pyx_L1;}
2466
2466
        }
2467
2467
        __pyx_L13:;
2468
2468
 
2469
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":618 */
 
2469
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":618 */
2470
2470
        __pyx_v_parent_node->seen = (__pyx_v_parent_node->seen + 1);
2471
2471
 
2472
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":619 */
 
2472
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":619 */
2473
2473
        __pyx_4 = (__pyx_v_parent_node->seen == PyList_GET_SIZE(__pyx_v_parent_node->children));
2474
2474
        if (__pyx_4) {
2475
2475
 
2476
 
          /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":623 */
 
2476
          /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":623 */
2477
2477
          __pyx_v_last_item = (__pyx_v_last_item + 1);
2478
2478
 
2479
 
          /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":624 */
 
2479
          /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":624 */
2480
2480
          __pyx_4 = (__pyx_v_last_item < PyList_GET_SIZE(__pyx_v_pending));
2481
2481
          if (__pyx_4) {
2482
2482
 
2483
 
            /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":625 */
 
2483
            /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":625 */
2484
2484
            Py_INCREF(((PyObject *)__pyx_v_parent_node));
2485
2485
 
2486
 
            /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":626 */
 
2486
            /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":626 */
2487
2487
            __pyx_4 = PyList_SetItem(__pyx_v_pending,__pyx_v_last_item,((PyObject *)__pyx_v_parent_node)); if (__pyx_4 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 626; goto __pyx_L1;}
2488
2488
            goto __pyx_L15;
2489
2489
          }
2492
2492
          }
2493
2493
          __pyx_L15:;
2494
2494
 
2495
 
          /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":629 */
 
2495
          /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":629 */
2496
2496
          __pyx_v_parent_node->seen = 0;
2497
2497
          goto __pyx_L14;
2498
2498
        }
2503
2503
  }
2504
2504
  Py_DECREF(__pyx_2); __pyx_2 = 0;
2505
2505
 
2506
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":630 */
 
2506
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":630 */
2507
2507
  Py_INCREF(__pyx_v_result);
2508
2508
  __pyx_r = __pyx_v_result;
2509
2509
  goto __pyx_L0;
2544
2544
  Py_INCREF(__pyx_v_tip_key);
2545
2545
  __pyx_v_sorter = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSorter *)Py_None); Py_INCREF(Py_None);
2546
2546
 
2547
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":639 */
 
2547
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":639 */
2548
2548
  __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 639; goto __pyx_L1;}
2549
2549
  Py_INCREF(__pyx_v_self);
2550
2550
  PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_self);
2556
2556
  __pyx_v_sorter = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_2);
2557
2557
  __pyx_2 = 0;
2558
2558
 
2559
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":640 */
 
2559
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":640 */
2560
2560
  __pyx_1 = ((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_sorter->__pyx_vtab)->topo_order(__pyx_v_sorter); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 640; goto __pyx_L1;}
2561
2561
  __pyx_r = __pyx_1;
2562
2562
  __pyx_1 = 0;
2647
2647
  Py_INCREF(__pyx_v_self);
2648
2648
  Py_INCREF(__pyx_v_key);
2649
2649
 
2650
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":687 */
 
2650
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":687 */
2651
2651
  Py_INCREF(__pyx_v_key);
2652
2652
  Py_DECREF(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->key);
2653
2653
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->key = __pyx_v_key;
2654
2654
 
2655
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":688 */
 
2655
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":688 */
2656
2656
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->merge_depth = (-1);
2657
2657
 
2658
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":689 */
 
2658
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":689 */
2659
2659
  Py_INCREF(Py_None);
2660
2660
  Py_DECREF(((PyObject *)((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->left_parent));
2661
2661
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->left_parent = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None);
2662
2662
 
2663
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":690 */
 
2663
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":690 */
2664
2664
  Py_INCREF(Py_None);
2665
2665
  Py_DECREF(((PyObject *)((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->left_pending_parent));
2666
2666
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->left_pending_parent = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None);
2667
2667
 
2668
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":691 */
 
2668
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":691 */
2669
2669
  Py_INCREF(Py_None);
2670
2670
  Py_DECREF(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->pending_parents);
2671
2671
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->pending_parents = Py_None;
2672
2672
 
2673
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":692 */
 
2673
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":692 */
2674
2674
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->_revno_first = (-1);
2675
2675
 
2676
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":693 */
 
2676
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":693 */
2677
2677
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->_revno_second = (-1);
2678
2678
 
2679
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":694 */
 
2679
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":694 */
2680
2680
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->_revno_last = (-1);
2681
2681
 
2682
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":695 */
 
2682
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":695 */
2683
2683
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->is_first_child = 0;
2684
2684
 
2685
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":696 */
 
2685
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":696 */
2686
2686
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->seen_by_child = 0;
2687
2687
 
2688
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":697 */
 
2688
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":697 */
2689
2689
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_self)->completed = 0;
2690
2690
 
2691
2691
  __pyx_r = 0;
2762
2762
  int __pyx_2;
2763
2763
  Py_INCREF(__pyx_v_self);
2764
2764
 
2765
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":707 */
 
2765
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":707 */
2766
2766
  __pyx_2 = ((PyObject *)__pyx_v_self->left_pending_parent) != Py_None;
2767
2767
  __pyx_1 = PyInt_FromLong(__pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 707; goto __pyx_L1;}
2768
2768
  __pyx_2 = PyObject_IsTrue(__pyx_1); if (__pyx_2 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 707; goto __pyx_L1;}
2780
2780
  }
2781
2781
  __pyx_L2:;
2782
2782
 
2783
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":709 */
 
2783
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":709 */
2784
2784
  __pyx_r = 0;
2785
2785
  goto __pyx_L0;
2786
2786
 
2806
2806
  __pyx_1 = (__pyx_v_self->_revno_first == (-1));
2807
2807
  if (__pyx_1) {
2808
2808
 
2809
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":713 */
 
2809
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":713 */
2810
2810
    __pyx_1 = (__pyx_v_self->_revno_second != (-1));
2811
2811
    if (__pyx_1) {
2812
2812
      __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 714; goto __pyx_L1;}
2826
2826
    }
2827
2827
    __pyx_L3:;
2828
2828
 
2829
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":715 */
 
2829
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":715 */
2830
2830
    __pyx_2 = PyInt_FromLong(__pyx_v_self->_revno_last); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;}
2831
2831
    __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;}
2832
2832
    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
2903
2903
  Py_INCREF(__pyx_v_tip_key);
2904
2904
  __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None); Py_INCREF(Py_None);
2905
2905
 
2906
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":746 */
 
2906
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":746 */
2907
2907
  if (!__Pyx_TypeTest(__pyx_v_known_graph, __pyx_ptype_6bzrlib_16_known_graph_pyx_KnownGraph)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 746; goto __pyx_L1;}
2908
2908
  Py_INCREF(__pyx_v_known_graph);
2909
2909
  Py_DECREF(((PyObject *)((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self)->graph));
2910
2910
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self)->graph = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx_KnownGraph *)__pyx_v_known_graph);
2911
2911
 
2912
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":748 */
 
2912
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":748 */
2913
2913
  __pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 748; goto __pyx_L1;}
2914
2914
  Py_DECREF(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self)->_revno_to_branch_count);
2915
2915
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self)->_revno_to_branch_count = __pyx_1;
2916
2916
  __pyx_1 = 0;
2917
2917
 
2918
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":749 */
 
2918
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":749 */
2919
2919
  __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 749; goto __pyx_L1;}
2920
2920
  Py_DECREF(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self)->_depth_first_stack);
2921
2921
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self)->_depth_first_stack = __pyx_1;
2922
2922
  __pyx_1 = 0;
2923
2923
 
2924
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":750 */
 
2924
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":750 */
2925
2925
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self)->_last_stack_item = (-1);
2926
2926
 
2927
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":751 */
 
2927
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":751 */
2928
2928
  __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 751; goto __pyx_L1;}
2929
2929
  Py_DECREF(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self)->_scheduled_nodes);
2930
2930
  ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self)->_scheduled_nodes = __pyx_1;
2931
2931
  __pyx_1 = 0;
2932
2932
 
2933
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":752 */
 
2933
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":752 */
2934
2934
  __pyx_2 = __pyx_v_tip_key != Py_None;
2935
2935
  if (__pyx_2) {
2936
2936
    if (PyObject_Cmp(__pyx_v_tip_key, __pyx_v_6bzrlib_16_known_graph_pyx_NULL_REVISION, &__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 752; goto __pyx_L1;}
2946
2946
  }
2947
2947
  if (__pyx_2) {
2948
2948
 
2949
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":754 */
 
2949
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":754 */
2950
2950
    __pyx_1 = PyObject_GetItem(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self)->graph->_nodes, __pyx_v_tip_key); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 754; goto __pyx_L1;}
2951
2951
    if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6bzrlib_16_known_graph_pyx__KnownGraphNode)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 754; goto __pyx_L1;}
2952
2952
    Py_DECREF(((PyObject *)__pyx_v_node));
2953
2953
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_1);
2954
2954
    __pyx_1 = 0;
2955
2955
 
2956
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":755 */
 
2956
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":755 */
2957
2957
    __pyx_1 = ((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx__MergeSorter *)((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self)->__pyx_vtab)->_push_node(((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self),__pyx_v_node,0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 755; goto __pyx_L1;}
2958
2958
    Py_DECREF(__pyx_1); __pyx_1 = 0;
2959
2959
    goto __pyx_L2;
2984
2984
  Py_INCREF(__pyx_v_node);
2985
2985
  __pyx_v_ms_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)Py_None); Py_INCREF(Py_None);
2986
2986
 
2987
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":761 */
 
2987
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":761 */
2988
2988
  __pyx_1 = __pyx_v_node->extra == Py_None;
2989
2989
  if (__pyx_1) {
2990
2990
 
2991
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":762 */
 
2991
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":762 */
2992
2992
    __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 762; goto __pyx_L1;}
2993
2993
    Py_INCREF(__pyx_v_node->key);
2994
2994
    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_node->key);
2998
2998
    __pyx_v_ms_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_3);
2999
2999
    __pyx_3 = 0;
3000
3000
 
3001
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":763 */
 
3001
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":763 */
3002
3002
    Py_INCREF(((PyObject *)__pyx_v_ms_node));
3003
3003
    Py_DECREF(__pyx_v_node->extra);
3004
3004
    __pyx_v_node->extra = ((PyObject *)__pyx_v_ms_node);
3011
3011
  }
3012
3012
  __pyx_L2:;
3013
3013
 
3014
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":766 */
 
3014
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":766 */
3015
3015
  Py_INCREF(((PyObject *)__pyx_v_ms_node));
3016
3016
  __pyx_r = __pyx_v_ms_node;
3017
3017
  goto __pyx_L0;
3046
3046
  __pyx_v_ms_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)Py_None); Py_INCREF(Py_None);
3047
3047
  __pyx_v_ms_parent_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)Py_None); Py_INCREF(Py_None);
3048
3048
 
3049
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":773 */
 
3049
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":773 */
3050
3050
  __pyx_1 = ((PyObject *)((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self->__pyx_vtab)->_get_ms_node(__pyx_v_self,__pyx_v_node)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 773; goto __pyx_L1;}
3051
3051
  Py_DECREF(((PyObject *)__pyx_v_ms_node));
3052
3052
  __pyx_v_ms_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_1);
3053
3053
  __pyx_1 = 0;
3054
3054
 
3055
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":774 */
 
3055
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":774 */
3056
3056
  __pyx_v_ms_node->merge_depth = __pyx_v_merge_depth;
3057
3057
 
3058
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":775 */
 
3058
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":775 */
3059
3059
  __pyx_2 = __pyx_v_node->parents == Py_None;
3060
3060
  if (__pyx_2) {
3061
3061
    __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;}
3075
3075
  }
3076
3076
  __pyx_L2:;
3077
3077
 
3078
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":778 */
 
3078
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":778 */
3079
3079
  __pyx_2 = (PyTuple_GET_SIZE(__pyx_v_node->parents) > 0);
3080
3080
  if (__pyx_2) {
3081
3081
 
3082
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":779 */
 
3082
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":779 */
3083
3083
    __pyx_1 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_tuple_node(__pyx_v_node->parents,0)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;}
3084
3084
    Py_DECREF(((PyObject *)__pyx_v_parent_node));
3085
3085
    __pyx_v_parent_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_1);
3086
3086
    __pyx_1 = 0;
3087
3087
 
3088
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":780 */
 
3088
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":780 */
3089
3089
    Py_INCREF(((PyObject *)__pyx_v_parent_node));
3090
3090
    Py_DECREF(((PyObject *)__pyx_v_ms_node->left_parent));
3091
3091
    __pyx_v_ms_node->left_parent = __pyx_v_parent_node;
3092
3092
 
3093
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":781 */
 
3093
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":781 */
3094
3094
    __pyx_2 = __pyx_v_parent_node->parents == Py_None;
3095
3095
    if (__pyx_2) {
3096
3096
 
3097
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":782 */
 
3097
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":782 */
3098
3098
      Py_INCREF(Py_None);
3099
3099
      Py_DECREF(((PyObject *)__pyx_v_ms_node->left_pending_parent));
3100
3100
      __pyx_v_ms_node->left_pending_parent = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None);
3101
3101
 
3102
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":783 */
 
3102
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":783 */
3103
3103
      Py_INCREF(Py_None);
3104
3104
      Py_DECREF(((PyObject *)__pyx_v_ms_node->left_parent));
3105
3105
      __pyx_v_ms_node->left_parent = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None);
3115
3115
  }
3116
3116
  __pyx_L3:;
3117
3117
 
3118
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":786 */
 
3118
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":786 */
3119
3119
  __pyx_2 = (PyTuple_GET_SIZE(__pyx_v_node->parents) > 1);
3120
3120
  if (__pyx_2) {
3121
3121
 
3122
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":787 */
 
3122
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":787 */
3123
3123
    __pyx_3 = PyList_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 787; goto __pyx_L1;}
3124
3124
    Py_DECREF(__pyx_v_ms_node->pending_parents);
3125
3125
    __pyx_v_ms_node->pending_parents = __pyx_3;
3126
3126
    __pyx_3 = 0;
3127
3127
 
3128
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":788 */
 
3128
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":788 */
3129
3129
    __pyx_4 = PyTuple_GET_SIZE(__pyx_v_node->parents);
3130
3130
    for (__pyx_v_pos = 1; __pyx_v_pos < __pyx_4; ++__pyx_v_pos) {
3131
3131
 
3132
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":789 */
 
3132
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":789 */
3133
3133
      __pyx_1 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_tuple_node(__pyx_v_node->parents,__pyx_v_pos)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 789; goto __pyx_L1;}
3134
3134
      Py_DECREF(((PyObject *)__pyx_v_parent_node));
3135
3135
      __pyx_v_parent_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_1);
3136
3136
      __pyx_1 = 0;
3137
3137
 
3138
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":790 */
 
3138
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":790 */
3139
3139
      __pyx_2 = __pyx_v_parent_node->parents == Py_None;
3140
3140
      if (__pyx_2) {
3141
3141
        goto __pyx_L6;
3143
3143
      }
3144
3144
      __pyx_L8:;
3145
3145
 
3146
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":792 */
 
3146
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":792 */
3147
3147
      __pyx_2 = PyList_Append(__pyx_v_ms_node->pending_parents,((PyObject *)__pyx_v_parent_node)); if (__pyx_2 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; goto __pyx_L1;}
3148
3148
      __pyx_L6:;
3149
3149
    }
3151
3151
  }
3152
3152
  __pyx_L5:;
3153
3153
 
3154
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":794 */
 
3154
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":794 */
3155
3155
  __pyx_v_ms_node->is_first_child = 1;
3156
3156
 
3157
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":795 */
 
3157
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":795 */
3158
3158
  __pyx_2 = ((PyObject *)__pyx_v_ms_node->left_parent) != Py_None;
3159
3159
  if (__pyx_2) {
3160
3160
 
3161
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":796 */
 
3161
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":796 */
3162
3162
    __pyx_3 = ((PyObject *)((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self->__pyx_vtab)->_get_ms_node(__pyx_v_self,__pyx_v_ms_node->left_parent)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 796; goto __pyx_L1;}
3163
3163
    Py_DECREF(((PyObject *)__pyx_v_ms_parent_node));
3164
3164
    __pyx_v_ms_parent_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_3);
3165
3165
    __pyx_3 = 0;
3166
3166
 
3167
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":797 */
 
3167
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":797 */
3168
3168
    __pyx_2 = __pyx_v_ms_parent_node->seen_by_child;
3169
3169
    if (__pyx_2) {
3170
3170
      __pyx_v_ms_node->is_first_child = 0;
3172
3172
    }
3173
3173
    __pyx_L10:;
3174
3174
 
3175
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":799 */
 
3175
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":799 */
3176
3176
    __pyx_v_ms_parent_node->seen_by_child = 1;
3177
3177
    goto __pyx_L9;
3178
3178
  }
3179
3179
  __pyx_L9:;
3180
3180
 
3181
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":800 */
 
3181
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":800 */
3182
3182
  __pyx_v_self->_last_stack_item = (__pyx_v_self->_last_stack_item + 1);
3183
3183
 
3184
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":801 */
 
3184
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":801 */
3185
3185
  __pyx_2 = (__pyx_v_self->_last_stack_item < PyList_GET_SIZE(__pyx_v_self->_depth_first_stack));
3186
3186
  if (__pyx_2) {
3187
3187
 
3188
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":802 */
 
3188
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":802 */
3189
3189
    Py_INCREF(((PyObject *)__pyx_v_node));
3190
3190
 
3191
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":803 */
 
3191
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":803 */
3192
3192
    __pyx_2 = PyList_SetItem(__pyx_v_self->_depth_first_stack,__pyx_v_self->_last_stack_item,((PyObject *)__pyx_v_node)); if (__pyx_2 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 803; goto __pyx_L1;}
3193
3193
    goto __pyx_L11;
3194
3194
  }
3238
3238
  __pyx_v_branch_count = Py_None; Py_INCREF(Py_None);
3239
3239
  __pyx_v_root_count = Py_None; Py_INCREF(Py_None);
3240
3240
 
3241
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":813 */
 
3241
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":813 */
3242
3242
  __pyx_1 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_list_node(__pyx_v_self->_depth_first_stack,__pyx_v_self->_last_stack_item)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 813; goto __pyx_L1;}
3243
3243
  Py_DECREF(((PyObject *)__pyx_v_node));
3244
3244
  __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_1);
3245
3245
  __pyx_1 = 0;
3246
3246
 
3247
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":814 */
 
3247
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":814 */
3248
3248
  Py_INCREF(__pyx_v_node->extra);
3249
3249
  Py_DECREF(((PyObject *)__pyx_v_ms_node));
3250
3250
  __pyx_v_ms_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_node->extra);
3251
3251
 
3252
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":815 */
 
3252
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":815 */
3253
3253
  __pyx_v_self->_last_stack_item = (__pyx_v_self->_last_stack_item - 1);
3254
3254
 
3255
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":816 */
 
3255
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":816 */
3256
3256
  __pyx_2 = ((PyObject *)__pyx_v_ms_node->left_parent) != Py_None;
3257
3257
  if (__pyx_2) {
3258
3258
 
3259
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":818 */
 
3259
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":818 */
3260
3260
    Py_INCREF(__pyx_v_ms_node->left_parent->extra);
3261
3261
    Py_DECREF(((PyObject *)__pyx_v_ms_parent_node));
3262
3262
    __pyx_v_ms_parent_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_ms_node->left_parent->extra);
3263
3263
 
3264
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":819 */
 
3264
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":819 */
3265
3265
    __pyx_2 = __pyx_v_ms_node->is_first_child;
3266
3266
    if (__pyx_2) {
3267
3267
 
3268
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":821 */
 
3268
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":821 */
3269
3269
      __pyx_v_ms_node->_revno_first = __pyx_v_ms_parent_node->_revno_first;
3270
3270
 
3271
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":822 */
 
3271
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":822 */
3272
3272
      __pyx_v_ms_node->_revno_second = __pyx_v_ms_parent_node->_revno_second;
3273
3273
 
3274
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":823 */
 
3274
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":823 */
3275
3275
      __pyx_v_ms_node->_revno_last = (__pyx_v_ms_parent_node->_revno_last + 1);
3276
3276
      goto __pyx_L3;
3277
3277
    }
3278
3278
    /*else*/ {
3279
3279
 
3280
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":827 */
 
3280
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":827 */
3281
3281
      __pyx_2 = (__pyx_v_ms_parent_node->_revno_first == (-1));
3282
3282
      if (__pyx_2) {
3283
3283
        __pyx_1 = PyInt_FromLong(__pyx_v_ms_parent_node->_revno_last); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 829; goto __pyx_L1;}
3294
3294
      }
3295
3295
      __pyx_L4:;
3296
3296
 
3297
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":832 */
 
3297
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":832 */
3298
3298
      __pyx_v_temp = PyDict_GetItem(__pyx_v_self->_revno_to_branch_count,__pyx_v_base_revno);
3299
3299
 
3300
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":834 */
 
3300
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":834 */
3301
3301
      __pyx_2 = (__pyx_v_temp == NULL);
3302
3302
      if (__pyx_2) {
3303
3303
        __pyx_1 = PyInt_FromLong(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; goto __pyx_L1;}
3316
3316
      }
3317
3317
      __pyx_L5:;
3318
3318
 
3319
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":838 */
 
3319
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":838 */
3320
3320
      __pyx_2 = PyDict_SetItem(__pyx_v_self->_revno_to_branch_count,__pyx_v_base_revno,__pyx_v_branch_count); if (__pyx_2 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; goto __pyx_L1;}
3321
3321
 
3322
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":840 */
 
3322
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":840 */
3323
3323
      __pyx_4 = PyInt_AsLong(__pyx_v_base_revno); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; goto __pyx_L1;}
3324
3324
      __pyx_v_ms_node->_revno_first = __pyx_4;
3325
3325
 
3326
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":841 */
 
3326
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":841 */
3327
3327
      __pyx_4 = PyInt_AsLong(__pyx_v_branch_count); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;}
3328
3328
      __pyx_v_ms_node->_revno_second = __pyx_4;
3329
3329
 
3330
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":842 */
 
3330
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":842 */
3331
3331
      __pyx_v_ms_node->_revno_last = 1;
3332
3332
    }
3333
3333
    __pyx_L3:;
3335
3335
  }
3336
3336
  /*else*/ {
3337
3337
 
3338
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":844 */
 
3338
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":844 */
3339
3339
    __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;}
3340
3340
    __pyx_v_temp = PyDict_GetItem(__pyx_v_self->_revno_to_branch_count,__pyx_1);
3341
3341
    Py_DECREF(__pyx_1); __pyx_1 = 0;
3342
3342
 
3343
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":845 */
 
3343
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":845 */
3344
3344
    __pyx_2 = (__pyx_v_temp == NULL);
3345
3345
    if (__pyx_2) {
3346
3346
 
3347
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":847 */
 
3347
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":847 */
3348
3348
      __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; goto __pyx_L1;}
3349
3349
      Py_DECREF(__pyx_v_root_count);
3350
3350
      __pyx_v_root_count = __pyx_3;
3351
3351
      __pyx_3 = 0;
3352
3352
 
3353
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":848 */
 
3353
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":848 */
3354
3354
      __pyx_v_ms_node->_revno_first = (-1);
3355
3355
 
3356
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":849 */
 
3356
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":849 */
3357
3357
      __pyx_v_ms_node->_revno_second = (-1);
3358
3358
 
3359
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":850 */
 
3359
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":850 */
3360
3360
      __pyx_v_ms_node->_revno_last = 1;
3361
3361
      goto __pyx_L6;
3362
3362
    }
3363
3363
    /*else*/ {
3364
3364
 
3365
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":852 */
 
3365
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":852 */
3366
3366
      __pyx_1 = PyInt_FromLong(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; goto __pyx_L1;}
3367
3367
      __pyx_3 = PyNumber_Add(((PyObject *)__pyx_v_temp), __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; goto __pyx_L1;}
3368
3368
      Py_DECREF(__pyx_1); __pyx_1 = 0;
3370
3370
      __pyx_v_root_count = __pyx_3;
3371
3371
      __pyx_3 = 0;
3372
3372
 
3373
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":853 */
 
3373
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":853 */
3374
3374
      __pyx_v_ms_node->_revno_first = 0;
3375
3375
 
3376
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":854 */
 
3376
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":854 */
3377
3377
      __pyx_4 = PyInt_AsLong(__pyx_v_root_count); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 854; goto __pyx_L1;}
3378
3378
      __pyx_v_ms_node->_revno_second = __pyx_4;
3379
3379
 
3380
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":855 */
 
3380
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":855 */
3381
3381
      __pyx_v_ms_node->_revno_last = 1;
3382
3382
    }
3383
3383
    __pyx_L6:;
3384
3384
 
3385
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":856 */
 
3385
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":856 */
3386
3386
    __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 856; goto __pyx_L1;}
3387
3387
    __pyx_2 = PyDict_SetItem(__pyx_v_self->_revno_to_branch_count,__pyx_1,__pyx_v_root_count); if (__pyx_2 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 856; goto __pyx_L1;}
3388
3388
    Py_DECREF(__pyx_1); __pyx_1 = 0;
3389
3389
  }
3390
3390
  __pyx_L2:;
3391
3391
 
3392
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":857 */
 
3392
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":857 */
3393
3393
  __pyx_v_ms_node->completed = 1;
3394
3394
 
3395
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":858 */
 
3395
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":858 */
3396
3396
  __pyx_2 = (PyList_GET_SIZE(__pyx_v_self->_scheduled_nodes) == 0);
3397
3397
  if (__pyx_2) {
3398
3398
    Py_INCREF(Py_True);
3402
3402
  }
3403
3403
  /*else*/ {
3404
3404
 
3405
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":862 */
 
3405
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":862 */
3406
3406
    __pyx_3 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_list_node(__pyx_v_self->_scheduled_nodes,(PyList_GET_SIZE(__pyx_v_self->_scheduled_nodes) - 1))); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;}
3407
3407
    Py_DECREF(((PyObject *)__pyx_v_prev_node));
3408
3408
    __pyx_v_prev_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_3);
3409
3409
    __pyx_3 = 0;
3410
3410
 
3411
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":864 */
 
3411
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":864 */
3412
3412
    Py_INCREF(__pyx_v_prev_node->extra);
3413
3413
    Py_DECREF(((PyObject *)__pyx_v_ms_prev_node));
3414
3414
    __pyx_v_ms_prev_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_prev_node->extra);
3415
3415
 
3416
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":865 */
 
3416
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":865 */
3417
3417
    __pyx_2 = (__pyx_v_ms_prev_node->merge_depth < __pyx_v_ms_node->merge_depth);
3418
3418
    if (__pyx_2) {
3419
3419
      Py_INCREF(Py_True);
3441
3441
  }
3442
3442
  __pyx_L7:;
3443
3443
 
3444
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":875 */
 
3444
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":875 */
3445
3445
  __pyx_2 = PyList_Append(__pyx_v_self->_scheduled_nodes,((PyObject *)__pyx_v_node)); if (__pyx_2 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; goto __pyx_L1;}
3446
3446
 
3447
3447
  __pyx_r = Py_None; Py_INCREF(Py_None);
3483
3483
  __pyx_v_ms_next_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)Py_None); Py_INCREF(Py_None);
3484
3484
  __pyx_v_ordered = Py_None; Py_INCREF(Py_None);
3485
3485
 
3486
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":881 */
 
3486
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":881 */
3487
3487
  __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; goto __pyx_L1;}
3488
3488
  Py_DECREF(__pyx_v_ordered);
3489
3489
  __pyx_v_ordered = __pyx_1;
3490
3490
  __pyx_1 = 0;
3491
3491
 
3492
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":882 */
 
3492
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":882 */
3493
3493
  while (1) {
3494
3494
    __pyx_2 = (__pyx_v_self->_last_stack_item >= 0);
3495
3495
    if (!__pyx_2) break;
3496
3496
 
3497
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":884 */
 
3497
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":884 */
3498
3498
    __pyx_1 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_list_node(__pyx_v_self->_depth_first_stack,__pyx_v_self->_last_stack_item)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 884; goto __pyx_L1;}
3499
3499
    Py_DECREF(((PyObject *)__pyx_v_last_node));
3500
3500
    __pyx_v_last_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_1);
3501
3501
    __pyx_1 = 0;
3502
3502
 
3503
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":886 */
 
3503
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":886 */
3504
3504
    __pyx_2 = (__pyx_v_last_node->gdfo == (-1));
3505
3505
    if (__pyx_2) {
3506
3506
      __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_errors); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 889; goto __pyx_L1;}
3519
3519
    }
3520
3520
    __pyx_L4:;
3521
3521
 
3522
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":890 */
 
3522
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":890 */
3523
3523
    Py_INCREF(__pyx_v_last_node->extra);
3524
3524
    Py_DECREF(((PyObject *)__pyx_v_ms_last_node));
3525
3525
    __pyx_v_ms_last_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_last_node->extra);
3526
3526
 
3527
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":891 */
 
3527
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":891 */
3528
3528
    __pyx_2 = (!((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_ms_last_node->__pyx_vtab)->has_pending_parents(__pyx_v_ms_last_node));
3529
3529
    if (__pyx_2) {
3530
3530
 
3531
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":893 */
 
3531
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":893 */
3532
3532
      __pyx_3 = ((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self->__pyx_vtab)->_pop_node(__pyx_v_self); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 893; goto __pyx_L1;}
3533
3533
      Py_DECREF(__pyx_3); __pyx_3 = 0;
3534
3534
 
3535
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":894 */
 
3535
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":894 */
3536
3536
      goto __pyx_L2;
3537
3537
      goto __pyx_L5;
3538
3538
    }
3539
3539
    __pyx_L5:;
3540
3540
 
3541
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":895 */
 
3541
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":895 */
3542
3542
    while (1) {
3543
3543
      __pyx_2 = ((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_ms_last_node->__pyx_vtab)->has_pending_parents(__pyx_v_ms_last_node);
3544
3544
      if (!__pyx_2) break;
3545
3545
 
3546
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":896 */
 
3546
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":896 */
3547
3547
      __pyx_2 = ((PyObject *)__pyx_v_ms_last_node->left_pending_parent) != Py_None;
3548
3548
      if (__pyx_2) {
3549
3549
 
3550
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":898 */
 
3550
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":898 */
3551
3551
        Py_INCREF(((PyObject *)__pyx_v_ms_last_node->left_pending_parent));
3552
3552
        Py_DECREF(((PyObject *)__pyx_v_next_node));
3553
3553
        __pyx_v_next_node = __pyx_v_ms_last_node->left_pending_parent;
3554
3554
 
3555
 
        /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":899 */
 
3555
        /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":899 */
3556
3556
        Py_INCREF(Py_None);
3557
3557
        Py_DECREF(((PyObject *)__pyx_v_ms_last_node->left_pending_parent));
3558
3558
        __pyx_v_ms_last_node->left_pending_parent = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None);
3569
3569
      }
3570
3570
      __pyx_L8:;
3571
3571
 
3572
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":909 */
 
3572
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":909 */
3573
3573
      __pyx_3 = ((PyObject *)((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self->__pyx_vtab)->_get_ms_node(__pyx_v_self,__pyx_v_next_node)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; goto __pyx_L1;}
3574
3574
      Py_DECREF(((PyObject *)__pyx_v_ms_next_node));
3575
3575
      __pyx_v_ms_next_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_3);
3576
3576
      __pyx_3 = 0;
3577
3577
 
3578
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":910 */
 
3578
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":910 */
3579
3579
      __pyx_2 = __pyx_v_ms_next_node->completed;
3580
3580
      if (__pyx_2) {
3581
3581
        goto __pyx_L6;
3583
3583
      }
3584
3584
      __pyx_L9:;
3585
3585
 
3586
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":917 */
 
3586
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":917 */
3587
3587
      __pyx_2 = __pyx_v_next_node == __pyx_v_ms_last_node->left_parent;
3588
3588
      if (__pyx_2) {
3589
3589
        __pyx_v_next_merge_depth = __pyx_v_ms_last_node->merge_depth;
3594
3594
      }
3595
3595
      __pyx_L10:;
3596
3596
 
3597
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":921 */
 
3597
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":921 */
3598
3598
      __pyx_1 = ((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self->__pyx_vtab)->_push_node(__pyx_v_self,__pyx_v_next_node,__pyx_v_next_merge_depth); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 921; goto __pyx_L1;}
3599
3599
      Py_DECREF(__pyx_1); __pyx_1 = 0;
3600
3600
 
3601
 
      /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":924 */
 
3601
      /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":924 */
3602
3602
      goto __pyx_L7;
3603
3603
      __pyx_L6:;
3604
3604
    }
3637
3637
  __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)Py_None); Py_INCREF(Py_None);
3638
3638
  __pyx_v_ordered = Py_None; Py_INCREF(Py_None);
3639
3639
 
3640
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":936 */
 
3640
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":936 */
3641
3641
  __pyx_1 = ((struct __pyx_vtabstruct_6bzrlib_16_known_graph_pyx__MergeSorter *)__pyx_v_self->__pyx_vtab)->_schedule_stack(__pyx_v_self); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 936; goto __pyx_L1;}
3642
3642
  Py_DECREF(__pyx_1); __pyx_1 = 0;
3643
3643
 
3644
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":946 */
 
3644
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":946 */
3645
3645
  __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 946; goto __pyx_L1;}
3646
3646
  Py_DECREF(__pyx_v_ordered);
3647
3647
  __pyx_v_ordered = __pyx_1;
3648
3648
  __pyx_1 = 0;
3649
3649
 
3650
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":948 */
 
3650
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":948 */
3651
3651
  for (__pyx_v_pos = PyList_GET_SIZE(__pyx_v_self->_scheduled_nodes)-1; __pyx_v_pos >= 0; --__pyx_v_pos) {
3652
3652
 
3653
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":949 */
 
3653
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":949 */
3654
3654
    __pyx_1 = ((PyObject *)__pyx_f_6bzrlib_16_known_graph_pyx__get_list_node(__pyx_v_self->_scheduled_nodes,__pyx_v_pos)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 949; goto __pyx_L1;}
3655
3655
    Py_DECREF(((PyObject *)__pyx_v_node));
3656
3656
    __pyx_v_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__KnownGraphNode *)__pyx_1);
3657
3657
    __pyx_1 = 0;
3658
3658
 
3659
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":950 */
 
3659
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":950 */
3660
3660
    Py_INCREF(__pyx_v_node->extra);
3661
3661
    Py_DECREF(((PyObject *)__pyx_v_ms_node));
3662
3662
    __pyx_v_ms_node = ((struct __pyx_obj_6bzrlib_16_known_graph_pyx__MergeSortNode *)__pyx_v_node->extra);
3663
3663
 
3664
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":951 */
 
3664
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":951 */
3665
3665
    __pyx_2 = PyList_Append(__pyx_v_ordered,((PyObject *)__pyx_v_ms_node)); if (__pyx_2 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;}
3666
3666
 
3667
 
    /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":952 */
 
3667
    /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":952 */
3668
3668
    Py_INCREF(Py_None);
3669
3669
    Py_DECREF(__pyx_v_node->extra);
3670
3670
    __pyx_v_node->extra = Py_None;
3671
3671
  }
3672
3672
 
3673
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":954 */
 
3673
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":954 */
3674
3674
  __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;}
3675
3675
  Py_DECREF(__pyx_v_self->_scheduled_nodes);
3676
3676
  __pyx_v_self->_scheduled_nodes = __pyx_1;
3677
3677
  __pyx_1 = 0;
3678
3678
 
3679
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":955 */
 
3679
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":955 */
3680
3680
  Py_INCREF(__pyx_v_ordered);
3681
3681
  __pyx_r = __pyx_v_ordered;
3682
3682
  goto __pyx_L0;
4532
4532
  if (PyObject_SetAttrString(__pyx_m, "_MergeSortNode", (PyObject *)&__pyx_type_6bzrlib_16_known_graph_pyx__MergeSortNode) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 666; goto __pyx_L1;}
4533
4533
  __pyx_ptype_6bzrlib_16_known_graph_pyx__MergeSortNode = &__pyx_type_6bzrlib_16_known_graph_pyx__MergeSortNode;
4534
4534
 
4535
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":54 */
 
4535
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":54 */
4536
4536
  __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 54; goto __pyx_L1;}
4537
4537
  Py_INCREF(__pyx_n_deque);
4538
4538
  PyList_SET_ITEM(__pyx_1, 0, __pyx_n_deque);
4543
4543
  Py_DECREF(__pyx_1); __pyx_1 = 0;
4544
4544
  Py_DECREF(__pyx_2); __pyx_2 = 0;
4545
4545
 
4546
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":55 */
 
4546
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":55 */
4547
4547
  __pyx_2 = __Pyx_Import(__pyx_n_gc, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; goto __pyx_L1;}
4548
4548
  if (PyObject_SetAttr(__pyx_m, __pyx_n_gc, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; goto __pyx_L1;}
4549
4549
  Py_DECREF(__pyx_2); __pyx_2 = 0;
4550
4550
 
4551
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":57 */
 
4551
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":57 */
4552
4552
  __pyx_1 = PyList_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; goto __pyx_L1;}
4553
4553
  Py_INCREF(__pyx_n_errors);
4554
4554
  PyList_SET_ITEM(__pyx_1, 0, __pyx_n_errors);
4564
4564
  Py_DECREF(__pyx_1); __pyx_1 = 0;
4565
4565
  Py_DECREF(__pyx_2); __pyx_2 = 0;
4566
4566
 
4567
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":60 */
 
4567
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":60 */
4568
4568
  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_revision); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; goto __pyx_L1;}
4569
4569
  __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_NULL_REVISION); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; goto __pyx_L1;}
4570
4570
  Py_DECREF(__pyx_2); __pyx_2 = 0;
4572
4572
  __pyx_v_6bzrlib_16_known_graph_pyx_NULL_REVISION = __pyx_1;
4573
4573
  __pyx_1 = 0;
4574
4574
 
4575
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":199 */
 
4575
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":199 */
4576
4576
  Py_INCREF(Py_True);
4577
4577
  __pyx_d1 = Py_True;
4578
4578
 
4579
 
  /* "/home/jameinel/dev/bzr/work/bzrlib/_known_graph_pyx.pyx":926 */
 
4579
  /* "/home/mbp/bzr/prepare-2.1/bzrlib/_known_graph_pyx.pyx":926 */
4580
4580
  return;
4581
4581
  __pyx_L1:;
4582
4582
  Py_XDECREF(__pyx_1);