← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Lalo Martins
  • Date: 2005-09-08 00:40:15 UTC
  • mto: (1185.1.22)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: lalo@exoweb.net-20050908004014-bb63b3378ac8ff58
turned get_revision_info into a RevisionSpec class

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
480
480
        """Print `file` to stdout."""
481
481
        self.lock_read()
482
482
        try:
483
 
            tree = self.revision_tree(self.lookup_revision(revno))
 
483
            tree = self.revision_tree(self.get_rev_id(revno))
484
484
            # use inventory as it was in that revision
485
485
            file_id = tree.inventory.path2id(file)
486
486
            if not file_id:
897
897
        # that they have a revno/revid.
898
898
        #   -- lalo@exoweb.net, 2005-09-07
899
899
        from bzrlib.errors import NoSuchRevision
900
 
        from bzrlib.revisionspec import get_revision_info
 
900
        from bzrlib.revisionspec import RevisionSpec
901
901
        try:
902
 
            revno, info = get_revision_info(self, revision)
 
902
            spec = RevisionSpec(self, revision)
903
903
        except NoSuchRevision:
904
904
            return None
905
 
        return info
 
905
        return spec.rev_id
906
906
 
907
907
 
908
908
    def revision_id_to_revno(self, revision_id):
1348
1348
        The name of a local directory that exists but is empty.
1349
1349
    """
1350
1350
    from bzrlib.merge import merge
1351
 
    from bzrlib.revisionspec import get_revision_info
 
1351
    from bzrlib.revisionspec import RevisionSpec
1352
1352
 
1353
1353
    assert isinstance(branch_from, Branch)
1354
1354
    assert isinstance(to_location, basestring)
1358
1358
    if revision is None:
1359
1359
        revno = branch_from.revno()
1360
1360
    else:
1361
 
        revno, rev_id = get_revision_info(branch_from, revision)
 
1361
        revno, rev_id = RevisionSpec(branch_from, revision)
1362
1362
    br_to.update_revisions(branch_from, stop_revision=revno)
1363
1363
    merge((to_location, -1), (to_location, 0), this_dir=to_location,
1364
1364
          check_clean=False, ignore_zero=True)