← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
231
231
        """
232
232
        self.control_files.dont_leave_in_place()
233
233
 
234
 
    @deprecated_method(deprecated_in((0, 16, 0)))
235
 
    def abspath(self, name):
236
 
        """Return absolute filename for something in the branch
237
 
        
238
 
        XXX: Robert Collins 20051017 what is this used for? why is it a branch
239
 
        method and not a tree method.
240
 
        """
241
 
        raise NotImplementedError(self.abspath)
242
 
 
243
234
    def bind(self, other):
244
235
        """Bind the local branch the other branch.
245
236
 
576
567
        """Return `Tree` object for last revision."""
577
568
        return self.repository.revision_tree(self.last_revision())
578
569
 
579
 
    def rename_one(self, from_rel, to_rel):
580
 
        """Rename one file.
581
 
 
582
 
        This can change the directory or the filename or both.
583
 
        """
584
 
        raise NotImplementedError(self.rename_one)
585
 
 
586
 
    def move(self, from_paths, to_name):
587
 
        """Rename files.
588
 
 
589
 
        to_name must exist as a versioned directory.
590
 
 
591
 
        If to_name exists and is a directory, the files are moved into
592
 
        it, keeping their old names.  If it is a directory, 
593
 
 
594
 
        Note that to_name is only the last component of the new name;
595
 
        this doesn't change the directory.
596
 
 
597
 
        This returns a list of (from_path, to_path) pairs for each
598
 
        entry that is moved.
599
 
        """
600
 
        raise NotImplementedError(self.move)
601
 
 
602
570
    def get_parent(self):
603
571
        """Return the parent location of the branch.
604
572
 
711
679
    @needs_read_lock
712
680
    def sprout(self, to_bzrdir, revision_id=None):
713
681
        """Create a new line of development from the branch, into to_bzrdir.
714
 
        
 
682
 
 
683
        to_bzrdir controls the branch format.
 
684
 
715
685
        revision_id: if not None, the revision history in the new branch will
716
686
                     be truncated to end with revision_id.
717
687
        """
718
 
        result = self._format.initialize(to_bzrdir)
 
688
        result = to_bzrdir.create_branch()
719
689
        self.copy_content_into(result, revision_id=revision_id)
720
690
        result.set_parent(self.bzrdir.root_transport.base)
721
691
        return result
735
705
        """
736
706
        if revision_id == _mod_revision.NULL_REVISION:
737
707
            new_history = []
738
 
        new_history = self.revision_history()
 
708
        else:
 
709
            new_history = self.revision_history()
739
710
        if revision_id is not None and new_history != []:
740
711
            try:
741
712
                new_history = new_history[:new_history.index(revision_id) + 1]
1520
1491
 
1521
1492
    base = property(_get_base, doc="The URL for the root of this branch.")
1522
1493
 
1523
 
    @deprecated_method(deprecated_in((0, 16, 0)))
1524
 
    def abspath(self, name):
1525
 
        """See Branch.abspath."""
1526
 
        return self._transport.abspath(name)
1527
 
 
1528
1494
    def is_locked(self):
1529
1495
        return self.control_files.is_locked()
1530
1496