← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Aaron Bentley
  • Date: 2012-07-13 16:47:00 UTC
  • mto: This revision was merged to the branch mainline in revision 6540.
  • Revision ID: aaron@aaronbentley.com-20120713164700-quzgzctkc2uv9alf
Fix get_uncommitted_data with no stored data.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
282
282
    def get_uncommitted_data(self):
283
283
        transform = self._get_uncommitted()
284
284
        if transform is None:
285
 
            return None, None, None
 
285
            return None, None
286
286
        records = shelf.Unshelver.iter_records(transform)
287
287
        metadata = shelf.Unshelver.parse_metadata(records)
288
288
        base_revision_id = metadata['revision_id']