← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Marius Kruger
  • Date: 2009-11-01 03:43:59 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-20091101034359-smwigavpe0dnej61
log -n0 should log up until the stop_revision with its meges and no further.
I was stopping when I reached the stop_revision_id, but didn't include the merged revisions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
400
400
                    log_count += 1
401
401
                    if log_count >= limit:
402
402
                        return
403
 
                # As per Bug #325618 we don't want to show parent revisions
404
 
                # outside of the specified range.
405
 
                # So we need to filter the revisions here again since
406
 
                # the lower levels also return the revision parents,
407
 
                # which is needed for filtering on file_ids.
408
 
                if rqst.get('direction') == 'forward':
409
 
                    if self.end_rev_id == rev_id:
410
 
                        return
411
 
                else:
412
 
                    if self.start_rev_id == rev_id:
413
 
                        return
414
403
 
415
404
    def _format_diff(self, rev, rev_id):
416
405
        diff_type = self.rqst.get('diff_type')