/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/xml6.py

  • Committer: v.ladeuil+lp at free
  • Date: 2007-02-04 17:41:12 UTC
  • mto: (2323.7.1 redirection)
  • mto: This revision was merged to the branch mainline in revision 2390.
  • Revision ID: v.ladeuil+lp@free.fr-20070204174112-iv6gxzinnjddlaxj
Add tests for redirection. Preserve transport decorations.

* bzrlib/tests/test_http.py:
(TestRedirections): new tests.

* bzrlib/tests/HttpServer.py:
(HttpServer): Make server host and port public once the socket
have been established.

* bzrlib/tests/HTTPTestUtil.py:
(RedirectRequestHandler, HTTPServerRedirecting): New http test
server for redirections. Only a whole host can be redirected, so
far.

* bzrlib/errors.py:
(RedirectRequested.__init__): Add a 'qual_proto' oso that
transport decorations can be transmitted to redirected transport.
(RedirectRequested._requalify_url,
RedirectRequested.get_source_url,
RedirectRequested.get_target_url): New methods providing fully
decorated urls.

* bzrlib/bzrdir.py:
(BzrDir.open_from_transport): The redirection should preserve
transport decorations.
(BzrDirMetaFormat1): To be able to specialize bzr branches from
foreign branches, we need to register BzrDirMetaFormat1 as the
default control format (instead of BzrDirMetaFormat which is
abstract and can still be used by foreign branches).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml6.py
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
 
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
from bzrlib import cache_utf8, inventory, errors, xml5
 
18
 
 
19
 
 
20
class Serializer_v6(xml5.Serializer_v5):
 
21
 
 
22
    def _append_inventory_root(self, append, inv):
 
23
        """Append the inventory root to output."""
 
24
        append('<inventory')
 
25
        append(' format="6"')
 
26
        if inv.revision_id is not None:
 
27
            append(' revision_id="')
 
28
            append(xml5._encode_and_escape(inv.revision_id))
 
29
        append('>\n')
 
30
        self._append_entry(append, inv.root)
 
31
 
 
32
    def _parent_condition(self, ie):
 
33
        return ie.parent_id is not None
 
34
 
 
35
    def _unpack_inventory(self, elt):
 
36
        """Construct from XML Element"""
 
37
        if elt.tag != 'inventory':
 
38
            raise errors.UnexpectedInventoryFormat('Root tag is %r' % elt.tag)
 
39
        format = elt.get('format')
 
40
        if format != '6':
 
41
            raise errors.UnexpectedInventoryFormat('Invalid format version %r'
 
42
                                                   % format)
 
43
        revision_id = elt.get('revision_id')
 
44
        if revision_id is not None:
 
45
            revision_id = cache_utf8.get_cached_unicode(revision_id)
 
46
        inv = inventory.Inventory(root_id=None, revision_id=revision_id)
 
47
        for e in elt:
 
48
            ie = self._unpack_entry(e, none_parents=True)
 
49
            inv.add(ie)
 
50
        return inv
 
51
 
 
52
 
 
53
serializer_v6 = Serializer_v6()