← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Patch Queue Manager
  • Date: 2012-08-23 14:24:38 UTC
  • mfrom: (6499.3.13 832042-shared-stores)
  • Revision ID: pqm@pqm.ubuntu.com-20120823142438-804xd3yql622ahhp
(vila) Share and cache local config files (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
384
384
            self._real_store = _mod_config.ControlStore(self.bzrdir)
385
385
 
386
386
    def external_url(self):
387
 
        return self.bzrdir.user_url
 
387
        return urlutils.join(self.branch.user_url, 'control.conf')
388
388
 
389
389
    def _load_content(self):
390
390
        medium = self.bzrdir._client._medium
3251
3251
        self._real_store = None
3252
3252
 
3253
3253
    def external_url(self):
3254
 
        return self.branch.user_url
 
3254
        return urlutils.join(self.branch.user_url, 'branch.conf')
3255
3255
 
3256
3256
    def _load_content(self):
3257
3257
        path = self.branch._remote_path()