/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 bzrlib/textinv.py

  • Committer: Vincent Ladeuil
  • Date: 2009-01-30 00:49:41 UTC
  • mto: (3982.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3983.
  • Revision ID: v.ladeuil+lp@free.fr-20090130004941-820fpd2ryyo127vv
Add more tests, fix pycurl double handling, revert previous tracking.

* bzrlib/tests/test_http.py:
(PredefinedRequestHandler): Renamed from
PreRecordedRequestHandler.
(PredefinedRequestHandler.handle_one_request): Get the canned
response from the test server directly.
(ActivityServerMixin): Make it a true object and intialize the
attributes in the constructor. Tests can now set the
canned_response attribute before querying the server.
(TestActivity.setUp, TestActivity.tearDown,
TestActivity.get_transport, TestActivity.assertActivitiesMatch):
Extracted from test_get to be able to write other tests.
(TestActivity.test_has, TestActivity.test_readv,
TestActivity.test_post): New tests, all cases should be covered
now.

* bzrlib/transport/http/response.py:
(RangeFile.__init__, RangeFile.read, handle_response): Revert
previous tracking, both http implementations can now report
activity from the socket.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get_ranged, PyCurlTransport._post): Revert
previous tracking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textinv.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
from bzrlib.errors import BzrError
19
 
from bzrlib.inventory import Inventory
 
19
from bzrlib.inventory import InventoryEntry, Inventory
20
20
 
21
21
 
22
22
START_MARK = "# bzr inventory format 3\n"
25
25
 
26
26
def escape(s):
27
27
    """Very simple URL-like escaping.
28
 
 
 
28
    
29
29
    (Why not just use backslashes?  Because then we couldn't parse
30
30
    lines just by splitting on spaces.)"""
31
31
    return (s.replace('\\', r'\x5c')
46
46
    # TODO: What if there's anything else?
47
47
 
48
48
    return s
49
 
 
50
 
 
 
49
    
 
50
                     
51
51
 
52
52
 
53
53
def write_text_inventory(inv, outf):
56
56
    for path, ie in inv.iter_entries():
57
57
        if inv.is_root(ie.file_id):
58
58
            continue
59
 
 
 
59
        
60
60
        outf.write(ie.file_id + ' ')
61
61
        outf.write(escape(ie.name) + ' ')
62
62
        outf.write(ie.kind + ' ')
63
63
        outf.write(ie.parent_id + ' ')
64
 
 
 
64
        
65
65
        if ie.kind == 'file':
66
66
            outf.write(ie.text_id)
67
67
            outf.write(' ' + ie.text_sha1)
74
74
    """Return an inventory read in from tf"""
75
75
    if tf.readline() != START_MARK:
76
76
        raise BzrError("missing start mark")
77
 
 
 
77
    
78
78
    inv = Inventory()
79
79
 
80
80
    for l in tf:
86
86
              'kind': fields[2],
87
87
              'parent_id': fields[3]}
88
88
        ##inv.add(ie)
89
 
 
 
89
        
90
90
    if l != END_MARK:
91
91
        raise BzrError("missing end mark")
92
92
    return inv