← Back to branch summary

~ubuntu-branches/ubuntu/karmic/bzr/karmic-proposed

« back to all changes in this revision

Viewing changes to bzrlib/version_info_formats/format_custom.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2009-04-29 19:56:21 UTC
  • mfrom: (1.1.52 upstream) (3.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20090429195621-601ojne4y8005km2
http://bugs.debian.org/464688
* New upstream release.
  + Fixes default format for upgrade command. (Closes: #464688)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/version_info_formats/format_custom.py
18
18
   tree info."""
19
19
 
20
20
from bzrlib import errors
 
21
from bzrlib.revision import (
 
22
   NULL_REVISION,
 
23
   )
21
24
from bzrlib.lazy_regex import lazy_compile
22
25
from bzrlib.version_info_formats import (
23
26
   create_date_str,
87
90
        info.add('branch_nick', self._branch.nick)
88
91
 
89
92
        revision_id = self._get_revision_id()
90
 
        if revision_id is None:
 
93
        if revision_id == NULL_REVISION:
91
94
            info.add('revno', 0)
92
95
        else:
93
96
            info.add('revno', self._branch.revision_id_to_revno(revision_id))