/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/version_info_formats/format_python.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/version_info_formats/format_python.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""A generator which creates a python script from the current tree info"""
18
18
 
19
19
import pprint
20
20
 
 
21
from bzrlib.revision import (
 
22
    NULL_REVISION,
 
23
    )
21
24
from bzrlib.version_info_formats import (
22
25
    create_date_str,
23
26
    VersionInfoBuilder,
57
60
        revisions = []
58
61
 
59
62
        revision_id = self._get_revision_id()
60
 
        if revision_id is None:
 
63
        if revision_id == NULL_REVISION:
61
64
            info['revno'] = 0
62
65
        else:
63
66
            info['revno'] = self._branch.revision_id_to_revno(revision_id)