← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.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:
bzrlib/workingtree.py
1623
1623
    @needs_read_lock
1624
1624
    def _last_revision(self):
1625
1625
        """helper for get_parent_ids."""
1626
 
        return self.branch.last_revision()
 
1626
        return _mod_revision.ensure_null(self.branch.last_revision())
1627
1627
 
1628
1628
    def is_locked(self):
1629
1629
        return self._control_files.is_locked()
2411
2411
            return osutils.safe_revision_id(
2412
2412
                        self._control_files.get('last-revision').read())
2413
2413
        except errors.NoSuchFile:
2414
 
            return None
 
2414
            return _mod_revision.NULL_REVISION
2415
2415
 
2416
2416
    def _change_last_revision(self, revision_id):
2417
2417
        """See WorkingTree._change_last_revision."""