← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2008-07-15 04:43:19 UTC
  • mto: This revision was merged to the branch mainline in revision 3542.
  • Revision ID: mbp@sourcefrog.net-20080715044319-wy26hdr8kvrb0ne9
Rename branch.get_stacked_on to get_stacked_on_url

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
331
331
            raise errors.InvalidRevisionNumber(revno)
332
332
        return self.repository.get_revision_delta(rh[revno-1])
333
333
 
334
 
    def get_stacked_on(self):
 
334
    def get_stacked_on_url(self):
335
335
        """Get the URL this branch is stacked against.
336
336
 
337
337
        :raises NotStacked: If the branch is not stacked.
338
338
        :raises UnstackableBranchFormat: If the branch does not support
339
339
            stacking.
340
340
        """
341
 
        raise NotImplementedError(self.get_stacked_on)
 
341
        raise NotImplementedError(self.get_stacked_on_url)
342
342
 
343
343
    def print_file(self, file, revision_id):
344
344
        """Print `file` to stdout."""
1837
1837
        except errors.InvalidURLJoin, e:
1838
1838
            raise errors.InaccessibleParent(parent, self.base)
1839
1839
 
1840
 
    def get_stacked_on(self):
 
1840
    def get_stacked_on_url(self):
1841
1841
        raise errors.UnstackableBranchFormat(self._format, self.base)
1842
1842
 
1843
1843
    def set_push_location(self, location):
2016
2016
 
2017
2017
    def _open_hook(self):
2018
2018
        try:
2019
 
            url = self.get_stacked_on()
 
2019
            url = self.get_stacked_on_url()
2020
2020
        except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2021
2021
            errors.UnstackableBranchFormat):
2022
2022
            pass
2178
2178
        """See Branch.get_old_bound_location"""
2179
2179
        return self._get_bound_location(False)
2180
2180
 
2181
 
    def get_stacked_on(self):
 
2181
    def get_stacked_on_url(self):
2182
2182
        self._check_stackable_repo()
2183
2183
        stacked_url = self._get_config_location('stacked_on_location')
2184
2184
        if stacked_url is None:
2197
2197
        self._check_stackable_repo()
2198
2198
        if not url:
2199
2199
            try:
2200
 
                old_url = self.get_stacked_on()
 
2200
                old_url = self.get_stacked_on_url()
2201
2201
            except (errors.NotStacked, errors.UnstackableBranchFormat,
2202
2202
                errors.UnstackableRepositoryFormat):
2203
2203
                return
2306
2306
    i.e. stacking.
2307
2307
    """
2308
2308
 
2309
 
    def get_stacked_on(self):
 
2309
    def get_stacked_on_url(self):
2310
2310
        raise errors.UnstackableBranchFormat(self._format, self.base)
2311
2311
 
2312
2312
    def set_stacked_on(self, url):