← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-08-20 14:19:21 UTC
  • mfrom: (2598.5.19 nullrevision)
  • Revision ID: pqm@pqm.ubuntu.com-20070820141921-kmbpaev7g9epuy08
NULL_REVISION is returned to indicate the null revision, not None

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1640
1640
    @needs_read_lock
1641
1641
    def _last_revision(self):
1642
1642
        """helper for get_parent_ids."""
1643
 
        return self.branch.last_revision()
 
1643
        return _mod_revision.ensure_null(self.branch.last_revision())
1644
1644
 
1645
1645
    def is_locked(self):
1646
1646
        return self._control_files.is_locked()
2443
2443
            return osutils.safe_revision_id(
2444
2444
                        self._control_files.get('last-revision').read())
2445
2445
        except errors.NoSuchFile:
2446
 
            return None
 
2446
            return _mod_revision.NULL_REVISION
2447
2447
 
2448
2448
    def _change_last_revision(self, revision_id):
2449
2449
        """See WorkingTree._change_last_revision."""