← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-07-12 09:49:37 UTC
  • mfrom: (2598.5.9 nullrevision)
  • Revision ID: pqm@pqm.ubuntu.com-20070712094937-rw5qbi81enh0pvhw
Make most functions prefer NULL_REVISION

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
505
505
 
506
506
    def revision_id_to_revno(self, revision_id):
507
507
        """Given a revision id, return its revno"""
508
 
        if revision_id is None:
 
508
        if _mod_revision.is_null(revision_id):
509
509
            return 0
510
510
        revision_id = osutils.safe_revision_id(revision_id)
511
511
        history = self.revision_history()
701
701
        :param revision_id: The revision-id to truncate history at.  May
702
702
          be None to copy complete history.
703
703
        """
 
704
        if revision_id == _mod_revision.NULL_REVISION:
 
705
            new_history = []
704
706
        new_history = self.revision_history()
705
 
        if revision_id is not None:
 
707
        if revision_id is not None and new_history != []:
706
708
            revision_id = osutils.safe_revision_id(revision_id)
707
709
            try:
708
710
                new_history = new_history[:new_history.index(revision_id) + 1]
1404
1406
                          other_branch=None):
1405
1407
        # stop_revision must be a descendant of last_revision
1406
1408
        stop_graph = self.repository.get_revision_graph(revision_id)
1407
 
        if last_rev is not None and last_rev not in stop_graph:
 
1409
        if (last_rev is not None and last_rev != _mod_revision.NULL_REVISION
 
1410
            and last_rev not in stop_graph):
1408
1411
            # our previous tip is not merged into stop_revision
1409
1412
            raise errors.DivergedBranches(self, other_branch)
1410
1413
        # make a new revision history from the graph
1449
1452
                stop_revision = osutils.safe_revision_id(stop_revision)
1450
1453
            # whats the current last revision, before we fetch [and change it
1451
1454
            # possibly]
1452
 
            last_rev = self.last_revision()
 
1455
            last_rev = _mod_revision.ensure_null(self.last_revision())
1453
1456
            # we fetch here regardless of whether we need to so that we pickup
1454
1457
            # filled in ghosts.
1455
1458
            self.fetch(other, stop_revision)
1779
1782
        # last_rev is not in the other_last_rev history, AND
1780
1783
        # other_last_rev is not in our history, and do it without pulling
1781
1784
        # history around
1782
 
        last_rev = self.last_revision()
1783
 
        if last_rev is not None:
 
1785
        last_rev = _mod_revision.ensure_null(self.last_revision())
 
1786
        if last_rev != _mod_revision.NULL_REVISION:
1784
1787
            other.lock_read()
1785
1788
            try:
1786
1789
                other_last_rev = other.last_revision()
1787
 
                if other_last_rev is not None:
 
1790
                if not _mod_revision.is_null(other_last_rev):
1788
1791
                    # neither branch is new, we have to do some work to
1789
1792
                    # ascertain diversion.
1790
1793
                    remote_graph = other.repository.get_revision_graph(
1813
1816
        if master is not None:
1814
1817
            old_tip = self.last_revision()
1815
1818
            self.pull(master, overwrite=True)
1816
 
            if old_tip in self.repository.get_ancestry(self.last_revision(),
1817
 
                                                       topo_sorted=False):
 
1819
            if old_tip in self.repository.get_ancestry(
 
1820
                _mod_revision.ensure_null(self.last_revision()),
 
1821
                topo_sorted=False):
1818
1822
                return None
1819
1823
            return old_tip
1820
1824
        return None
1961
1965
        self._clear_cached_state()
1962
1966
 
1963
1967
    def _check_history_violation(self, revision_id):
1964
 
        last_revision = self.last_revision()
1965
 
        if last_revision is None:
 
1968
        last_revision = _mod_revision.ensure_null(self.last_revision())
 
1969
        if _mod_revision.is_null(last_revision):
1966
1970
            return
1967
1971
        if last_revision not in self._lefthand_history(revision_id):
1968
1972
            raise errors.AppendRevisionsOnlyViolation(self.base)