~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remotebranch.py

  • Committer: Martin Pool
  • Date: 2005-08-17 02:06:19 UTC
  • Revision ID: mbp@sourcefrog.net-20050817020618-c7ae430253df8532
- rearrangement of modules, contributed by Gustavo Niemeyer


1) Moved plugins directory to bzrlib/, so that there's a standard
  plugin directory which is not only installed with bzr itself
  but is also available when using bzr from the development tree.
  BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
  standard plugins directory.

2) Moved the needed third-party tools to an internal directory under
  bzrlib/util.  This makes sure that needed tools are available in
  the bzr installation, including the correct/expected version, and
  eases the process of packaging and redistribution of bzr
  ('setup.py bdist*' creates a working distribution).

3) Fixed setup.py including the needed package entries.

I hope you find them useful.

Show diffs side-by-side

added added

removed removed

Lines of Context:
47
47
        self.status = status
48
48
 
49
49
if ENABLE_URLGRABBER:
50
 
    import urlgrabber
51
 
    import urlgrabber.keepalive
52
 
    urlgrabber.keepalive.DEBUG = 0
 
50
    import util.urlgrabber
 
51
    import util.urlgrabber.keepalive
 
52
    util.urlgrabber.keepalive.DEBUG = 0
53
53
    def get_url(path, compressed=False):
54
54
        try:
55
55
            url = path
56
56
            if compressed:
57
57
                url += '.gz'
58
58
            mutter("grab url %s" % url)
59
 
            url_f = urlgrabber.urlopen(url, keepalive=1, close_connection=0)
 
59
            url_f = util.urlgrabber.urlopen(url, keepalive=1, close_connection=0)
60
60
            if url_f.status != 200:
61
61
                raise GetFailed(url, url_f.status)
62
62
            if not compressed: