← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2012-06-28 16:17:34 UTC
  • mfrom: (6531 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6533.
  • Revision ID: jelmer@samba.org-20120628161734-2iqmgnxx6ogt9o6h
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1034
1034
    def _read_last_revision_info(self):
1035
1035
        raise NotImplementedError(self._read_last_revision_info)
1036
1036
 
1037
 
    @deprecated_method(deprecated_in((2, 4, 0)))
1038
 
    def import_last_revision_info(self, source_repo, revno, revid):
1039
 
        """Set the last revision info, importing from another repo if necessary.
1040
 
 
1041
 
        :param source_repo: Source repository to optionally fetch from
1042
 
        :param revno: Revision number of the new tip
1043
 
        :param revid: Revision id of the new tip
1044
 
        """
1045
 
        if not self.repository.has_same_location(source_repo):
1046
 
            self.repository.fetch(source_repo, revision_id=revid)
1047
 
        self.set_last_revision_info(revno, revid)
1048
 
 
1049
1037
    def import_last_revision_info_and_tags(self, source, revno, revid,
1050
1038
                                           lossy=False):
1051
1039
        """Set the last revision info, importing from another repo if necessary.
1694
1682
        """True if this format supports leaving locks in place."""
1695
1683
        return False # by default
1696
1684
 
1697
 
    @classmethod
1698
 
    @deprecated_method(deprecated_in((2, 4, 0)))
1699
 
    def unregister_format(klass, format):
1700
 
        format_registry.remove(format)
1701
 
 
1702
1685
    def __str__(self):
1703
1686
        return self.get_format_description().rstrip()
1704
1687