~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisionspec.py

  • Committer: Aaron Bentley
  • Date: 2007-07-25 05:24:39 UTC
  • mto: This revision was merged to the branch mainline in revision 2733.
  • Revision ID: aaron.bentley@utoronto.ca-20070725052439-t6hzz6o142as6wmd
Return NULL_REVISION instead of None for the null revision

Show diffs side-by-side

added added

removed removed

Lines of Context:
58
58
                self.rev_id = None
59
59
            else:
60
60
                self.rev_id = branch.get_rev_id(self.revno)
 
61
        elif rev_id is None:
 
62
            self.rev_id = None
61
63
        else:
62
64
            self.rev_id = rev_id
63
65
 
454
456
            rev = branch.repository.get_revision(r.rev_id)
455
457
            if not rev.parent_ids:
456
458
                revno = 0
457
 
                revision_id = None
 
459
                revision_id = revision.NULL_REVISION
458
460
            else:
459
461
                revision_id = rev.parent_ids[0]
460
462
                try: