/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to workingtree.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-12-01 15:06:29 UTC
  • mto: (2172.3.1 bzr.73948)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: v.ladeuil+lp@free.fr-20061201150629-zjd2an87u0r7nhhw
The tests that would have help avoid bug #73948 and all that mess :)

* bzrlib/transport/http/response.py:
(handle_response): Translate a 416 http error code into a bzr
exception.

* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPDefaultErrorHandler.http_error_default): Translate a 416 http
error code into a bzr exception.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): It could happen that pycrul
itself detect a short read.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase._retry_get): New method, factorizing the retry
logic.
(HttpTransportBase.readv): We can have exception during the
initial GET worth degrading the range requirements (i.e. retrying
the GET request with either single or not ranges).

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_readv_short_read): InvalidRange can also be
raised.

* bzrlib/tests/test_http.py:
(TestRangeRequestServer.test_readv_invalid_ranges): Was named
test_readv_short_read, the new name make the intent
clearer. Depending of the code path used (urllib or pycurl), both
exceptions can be raised.

* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.do_GET): If invalid ranges are
specified, returns a 416 instead of the whole file (both are valid
according to the RFC).

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
1
 
# Copyright (C) 2008 Jelmer Vernooij <jelmer@samba.org>
2
 
#
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
#
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
#
13
 
# You should have received a copy of the GNU General Public License
14
 
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
 
"""An adapter between a Git index and a Bazaar Working Tree"""
18
 
 
19
 
import os
20
 
 
21
 
from bzrlib import (
22
 
    inventory,
23
 
    lockable_files,
24
 
    lockdir,
25
 
    transport,
26
 
    urlutils,
27
 
    workingtree,
28
 
    )
29
 
 
30
 
from dulwich.index import Index
31
 
 
32
 
class GitWorkingTree(workingtree.WorkingTree):
33
 
    """A Git working tree."""
34
 
 
35
 
    def __init__(self, bzrdir, repo, branch):
36
 
        self.basedir = bzrdir.transport.base
37
 
        self.bzrdir = bzrdir
38
 
        self.repository = repo
39
 
        self._branch = branch
40
 
        self._transport = bzrdir.transport
41
 
 
42
 
        self.controldir = urlutils.join(self.repository._git.path, 'bzr')
43
 
 
44
 
        try:
45
 
            os.makedirs(self.controldir)
46
 
            os.makedirs(os.path.join(self.controldir, 'lock'))
47
 
        except OSError:
48
 
            pass
49
 
 
50
 
        self._control_files = lockable_files.LockableFiles(
51
 
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
52
 
 
53
 
        self._format = GitWorkingTreeFormat()
54
 
 
55
 
        self.index = Index(os.path.join(self.repository._git.controldir(), 
56
 
            "index"))
57
 
 
58
 
    def unlock(self):
59
 
        # non-implementation specific cleanup
60
 
        self._cleanup()
61
 
 
62
 
        # reverse order of locking.
63
 
        try:
64
 
            return self._control_files.unlock()
65
 
        finally:
66
 
            self.branch.unlock()
67
 
 
68
 
    def is_control_filename(self, path):
69
 
        return os.path.basename(path) == ".git"
70
 
 
71
 
    def _get_inventory(self):
72
 
        return inventory.Inventory()
73
 
 
74
 
    inventory = property(_get_inventory,
75
 
                         doc="Inventory of this Tree")
76
 
 
77
 
 
78
 
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
79
 
 
80
 
    def get_format_description(self):
81
 
        return "Git Working Tree"