← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Vincent Ladeuil
  • Date: 2012-07-31 09:18:07 UTC
  • mto: This revision was merged to the branch mainline in revision 6554.
  • Revision ID: v.ladeuil+lp@free.fr-20120731091807-tft1lk8zw84rp1nj
Use a proper unique url for remote config files.

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
3263
3263
        self._real_store = None
3264
3264
 
3265
3265
    def external_url(self):
3266
 
        return self.branch.user_url
 
3266
        return urlutils.join(self.branch.user_url, 'branch.conf')
3267
3267
 
3268
3268
    def _load_content(self):
3269
3269
        path = self.branch._remote_path()