← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Jonathan Riddell
  • Date: 2011-06-30 11:14:06 UTC
  • mfrom: (6002 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6003.
  • Revision ID: jriddell@canonical.com-20110630111406-eimf301w6x92xkk7
merge in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
513
513
        rev_iter = iter(merge_sorted_revisions)
514
514
        if start_revision_id is not None:
515
515
            for node in rev_iter:
516
 
                rev_id = node.key[-1]
 
516
                rev_id = node.key
517
517
                if rev_id != start_revision_id:
518
518
                    continue
519
519
                else:
525
525
        if stop_revision_id is None:
526
526
            # Yield everything
527
527
            for node in rev_iter:
528
 
                rev_id = node.key[-1]
 
528
                rev_id = node.key
529
529
                yield (rev_id, node.merge_depth, node.revno,
530
530
                       node.end_of_merge)
531
531
        elif stop_rule == 'exclude':
532
532
            for node in rev_iter:
533
 
                rev_id = node.key[-1]
 
533
                rev_id = node.key
534
534
                if rev_id == stop_revision_id:
535
535
                    return
536
536
                yield (rev_id, node.merge_depth, node.revno,
537
537
                       node.end_of_merge)
538
538
        elif stop_rule == 'include':
539
539
            for node in rev_iter:
540
 
                rev_id = node.key[-1]
 
540
                rev_id = node.key
541
541
                yield (rev_id, node.merge_depth, node.revno,
542
542
                       node.end_of_merge)
543
543
                if rev_id == stop_revision_id:
549
549
            ancestors = graph.find_unique_ancestors(start_revision_id,
550
550
                                                    [stop_revision_id])
551
551
            for node in rev_iter:
552
 
                rev_id = node.key[-1]
 
552
                rev_id = node.key
553
553
                if rev_id not in ancestors:
554
554
                    continue
555
555
                yield (rev_id, node.merge_depth, node.revno,
565
565
            reached_stop_revision_id = False
566
566
            revision_id_whitelist = []
567
567
            for node in rev_iter:
568
 
                rev_id = node.key[-1]
 
568
                rev_id = node.key
569
569
                if rev_id == left_parent:
570
570
                    # reached the left parent after the stop_revision
571
571
                    return
2942
2942
        # you can always ask for the URL; but you might not be able to use it
2943
2943
        # if the repo can't support stacking.
2944
2944
        ## self._check_stackable_repo()
2945
 
        stacked_url = self._get_config_location('stacked_on_location')
 
2945
        # stacked_on_location is only ever defined in branch.conf, so don't
 
2946
        # waste effort reading the whole stack of config files.
 
2947
        config = self.get_config()._get_branch_data_config()
 
2948
        stacked_url = self._get_config_location('stacked_on_location',
 
2949
            config=config)
2946
2950
        if stacked_url is None:
2947
2951
            raise errors.NotStacked(self)
2948
2952
        return stacked_url