← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Ian Clatworthy
  • Date: 2008-06-05 14:07:37 UTC
  • mto: (3221.19.3 push.reference)
  • mto: This revision was merged to the branch mainline in revision 3537.
  • Revision ID: ian.clatworthy@canonical.com-20080605140737-skoe3jya8m851o1z
tweaks by ianc during review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
347
347
        raise NotImplementedError(self.set_revision_history)
348
348
 
349
349
    def set_stacked_on(self, url):
350
 
        """set the URL this branch is stacked against.
 
350
        """Set the URL this branch is stacked against.
351
351
 
352
352
        :raises UnstackableBranchFormat: If the branch does not support
353
353
            stacking.
1143
1143
        raise NotImplementedError(self._branch_class)
1144
1144
 
1145
1145
    def open(self, a_bzrdir, _found=False):
1146
 
        """Return the branch object for a_bzrdir
 
1146
        """Return the branch object for a_bzrdir.
1147
1147
 
1148
1148
        _found is a private parameter, do not use it. It is used to indicate
1149
1149
               if format probing has already be done.
2146
2146
            source_repository = self._get_fallback_repository(old_url)
2147
2147
            for revision_id in chain([self.last_revision()],
2148
2148
                self.tags.get_reverse_tag_dict()):
2149
 
                self.repository.fetch(source_repository, revision_id, find_ghosts=True)
 
2149
                self.repository.fetch(source_repository, revision_id,
 
2150
                    find_ghosts=True)
2150
2151
        else:
2151
2152
            self._activate_fallback_location(url)
2152
2153
        # write this out after the repository is stacked to avoid setting a
2236
2237
class BzrBranch6(BzrBranch7):
2237
2238
    """See BzrBranchFormat6 for the capabilities of this branch.
2238
2239
 
2239
 
    This subclass of BzrBranch7 disables the new features BzrBranch7 added.
 
2240
    This subclass of BzrBranch7 disables the new features BzrBranch7 added,
 
2241
    i.e. stacking.
2240
2242
    """
2241
2243
 
2242
2244
    def get_stacked_on(self):