← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Robert Collins
  • Date: 2007-03-07 01:14:11 UTC
  • mfrom: (2321 +trunk)
  • mto: (2321.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070307011411-0cmmc8atx67v3nv7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1354
1354
        self.set_revision_history(history)
1355
1355
 
1356
1356
    def _gen_revision_history(self):
1357
 
        history = [l.rstrip('\r\n') for l in
1358
 
                self.control_files.get('revision-history').readlines()]
 
1357
        history = self.control_files.get('revision-history').read().split('\n')
 
1358
        if history[-1:] == ['']:
 
1359
            # There shouldn't be a trailing newline, but just in case.
 
1360
            history.pop()
1359
1361
        return history
1360
1362
 
1361
1363
    @needs_read_lock