← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/version_info_formats/format_rio.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/version_info_formats/format_rio.py
16
16
 
17
17
"""A generator which creates a rio stanza of the current tree info"""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from bzrlib import hooks
20
22
from bzrlib.revision import (
21
23
    NULL_REVISION,
60
62
                info.add('clean', 'False')
61
63
 
62
64
        if self._include_history:
63
 
            self._extract_revision_history()
64
65
            log = Stanza()
65
66
            for (revision_id, message,
66
 
                 timestamp, timezone) in self._revision_history_info:
 
67
                 timestamp, timezone) in self._iter_revision_history():
67
68
                log.add('id', revision_id)
68
69
                log.add('message', message)
69
70
                log.add('date', create_date_str(timestamp, timezone))