/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Marius Kruger
  • Date: 2009-11-21 16:12:55 UTC
  • mto: (4867.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4868.
  • Revision ID: marius.kruger@enerweb.co.za-20091121161255-v9jzyxijzphyz056
mainline_stop_rev -> left_parent

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
500
500
        elif stop_rule == 'with-merges':
501
501
            stop_rev = self.repository.get_revision(stop_revision_id)
502
502
            if stop_rev.parent_ids:
503
 
                mainline_stop_rev = stop_rev.parent_ids[0] # left parent
 
503
                left_parent = stop_rev.parent_ids[0]
504
504
            else:
505
 
                mainline_stop_rev = _mod_revision.NULL_REVISION
 
505
                left_parent = _mod_revision.NULL_REVISION
 
506
            # left_parent is the actual revision we want to stop logging at,
 
507
            # since we want to show the merged revisions after the stop_rev too
506
508
            reached_stop_revision_id = False
507
509
            revision_id_whitelist = []
508
510
            for node in rev_iter:
509
511
                rev_id = node.key[-1]
510
 
                if rev_id == mainline_stop_rev:
511
 
                    # reached the mainline after the stop_revision
 
512
                if rev_id == left_parent:
 
513
                    # reached the left parent after the stop_revision
512
514
                    return
513
515
                if (not reached_stop_revision_id or
514
516
                        rev_id in revision_id_whitelist):