/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2006 Canonical Ltd
1711.3.2 by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions
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
"""Read in a bundle stream, and process it into a BundleReader object."""
0.5.7 by John Arbash Meinel
Added a bunch more information about changesets. Can now read back in all of the meta information.
18
1185.82.96 by Aaron Bentley
Got first binary test passing
19
import base64
1185.82.78 by Aaron Bentley
Cleanups
20
from cStringIO import StringIO
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
21
import os
22
import pprint
23
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
24
from bzrlib import (
25
    osutils,
26
    )
1711.3.2 by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions
27
import bzrlib.errors
1185.82.131 by Aaron Bentley
Move BadBundle error (and subclasses) to errors.py
28
from bzrlib.errors import (TestamentMismatch, BzrError, 
1185.82.139 by Aaron Bentley
Raise NotABundle when a non-bundle is supplied
29
                           MalformedHeader, MalformedPatches, NotABundle)
0.5.116 by John Arbash Meinel
Fixed a bug based on the new InventoryEntry separation.
30
from bzrlib.inventory import (Inventory, InventoryEntry,
31
                              InventoryDirectory, InventoryFile,
1731.1.55 by Aaron Bentley
Fix bundle handling
32
                              InventoryLink)
1711.4.19 by John Arbash Meinel
Bundles were still using os.path.join to compute paths rather than osutils.pathjoin
33
from bzrlib.osutils import sha_file, sha_string, pathjoin
1185.82.78 by Aaron Bentley
Cleanups
34
from bzrlib.revision import Revision, NULL_REVISION
1185.82.116 by Aaron Bentley
Introduce StrictTestament, get test failing for the right reasons
35
from bzrlib.testament import StrictTestament
1185.82.78 by Aaron Bentley
Cleanups
36
from bzrlib.trace import mutter, warning
1711.3.2 by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions
37
import bzrlib.transport
1185.82.78 by Aaron Bentley
Cleanups
38
from bzrlib.tree import Tree
1711.3.2 by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions
39
import bzrlib.urlutils
1185.82.78 by Aaron Bentley
Cleanups
40
from bzrlib.xml5 import serializer_v5
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
41
0.5.57 by John Arbash Meinel
Simplified the header, only output base if it is not the expected one.
42
0.5.36 by John Arbash Meinel
Updated so that read_changeset is able to parse the output
43
class RevisionInfo(object):
44
    """Gets filled out for each revision object that is read.
45
    """
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
46
    def __init__(self, revision_id):
47
        self.revision_id = revision_id
0.5.36 by John Arbash Meinel
Updated so that read_changeset is able to parse the output
48
        self.sha1 = None
49
        self.committer = None
0.5.39 by John Arbash Meinel
(broken) Working on changing the processing to use a ChangesetTree.
50
        self.date = None
0.5.36 by John Arbash Meinel
Updated so that read_changeset is able to parse the output
51
        self.timestamp = None
52
        self.timezone = None
53
        self.inventory_sha1 = None
54
1185.82.27 by Aaron Bentley
Fixed most revision attribute handling
55
        self.parent_ids = None
1185.82.74 by Aaron Bentley
Allow custom base for any revision
56
        self.base_id = None
0.5.36 by John Arbash Meinel
Updated so that read_changeset is able to parse the output
57
        self.message = None
1185.82.27 by Aaron Bentley
Fixed most revision attribute handling
58
        self.properties = None
1185.82.77 by Aaron Bentley
Move tree actions to RevisionInfo
59
        self.tree_actions = None
0.5.36 by John Arbash Meinel
Updated so that read_changeset is able to parse the output
60
61
    def __str__(self):
62
        return pprint.pformat(self.__dict__)
63
0.5.37 by John Arbash Meinel
Made read_changeset able to spit out 'Revision' entities.
64
    def as_revision(self):
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
65
        rev = Revision(revision_id=self.revision_id,
0.5.37 by John Arbash Meinel
Made read_changeset able to spit out 'Revision' entities.
66
            committer=self.committer,
67
            timestamp=float(self.timestamp),
68
            timezone=int(self.timezone),
69
            inventory_sha1=self.inventory_sha1,
70
            message='\n'.join(self.message))
71
1185.82.28 by Aaron Bentley
Got parent_id handling working
72
        if self.parent_ids:
73
            rev.parent_ids.extend(self.parent_ids)
1185.82.35 by Aaron Bentley
Read revision properties
74
1185.82.59 by Aaron Bentley
Behave properly when there are no properties in a revision
75
        if self.properties:
76
            for property in self.properties:
77
                key_end = property.find(': ')
78
                assert key_end is not None
79
                key = property[:key_end].encode('utf-8')
80
                value = property[key_end+2:].encode('utf-8')
81
                rev.properties[key] = value
1185.82.35 by Aaron Bentley
Read revision properties
82
0.5.37 by John Arbash Meinel
Made read_changeset able to spit out 'Revision' entities.
83
        return rev
84
1185.82.123 by Aaron Bentley
Cleanups to prepare for review
85
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
86
class BundleInfo(object):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
87
    """This contains the meta information. Stuff that allows you to
88
    recreate the revision or inventory XML.
0.5.7 by John Arbash Meinel
Added a bunch more information about changesets. Can now read back in all of the meta information.
89
    """
90
    def __init__(self):
91
        self.committer = None
92
        self.date = None
0.5.17 by John Arbash Meinel
adding apply-changset, plus more meta information.
93
        self.message = None
0.5.36 by John Arbash Meinel
Updated so that read_changeset is able to parse the output
94
0.5.39 by John Arbash Meinel
(broken) Working on changing the processing to use a ChangesetTree.
95
        # A list of RevisionInfo objects
0.5.36 by John Arbash Meinel
Updated so that read_changeset is able to parse the output
96
        self.revisions = []
0.5.56 by John Arbash Meinel
A couple more fixups, it seems actually capable now of writing out a changeset, and reading it back.
97
98
        # The next entries are created during complete_info() and
99
        # other post-read functions.
100
101
        # A list of real Revision objects
102
        self.real_revisions = []
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
103
104
        self.timestamp = None
105
        self.timezone = None
0.5.15 by John Arbash Meinel
Created an apply-changeset function, and modified output for better parsing.
106
0.5.7 by John Arbash Meinel
Added a bunch more information about changesets. Can now read back in all of the meta information.
107
    def __str__(self):
108
        return pprint.pformat(self.__dict__)
109
0.5.39 by John Arbash Meinel
(broken) Working on changing the processing to use a ChangesetTree.
110
    def complete_info(self):
111
        """This makes sure that all information is properly
112
        split up, based on the assumptions that can be made
113
        when information is missing.
114
        """
1793.3.8 by John Arbash Meinel
Removed duplicated highres date code.
115
        from bzrlib.bundle.serializer import unpack_highres_date
0.5.56 by John Arbash Meinel
A couple more fixups, it seems actually capable now of writing out a changeset, and reading it back.
116
        # Put in all of the guessable information.
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
117
        if not self.timestamp and self.date:
0.5.81 by John Arbash Meinel
Cleaning up from pychecker.
118
            self.timestamp, self.timezone = unpack_highres_date(self.date)
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
119
0.5.56 by John Arbash Meinel
A couple more fixups, it seems actually capable now of writing out a changeset, and reading it back.
120
        self.real_revisions = []
0.5.39 by John Arbash Meinel
(broken) Working on changing the processing to use a ChangesetTree.
121
        for rev in self.revisions:
0.5.60 by John Arbash Meinel
read_changeset now parses the date: subheader of revisions correctly.
122
            if rev.timestamp is None:
123
                if rev.date is not None:
124
                    rev.timestamp, rev.timezone = \
0.5.81 by John Arbash Meinel
Cleaning up from pychecker.
125
                            unpack_highres_date(rev.date)
0.5.60 by John Arbash Meinel
read_changeset now parses the date: subheader of revisions correctly.
126
                else:
127
                    rev.timestamp = self.timestamp
128
                    rev.timezone = self.timezone
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
129
            if rev.message is None and self.message:
130
                rev.message = self.message
131
            if rev.committer is None and self.committer:
132
                rev.committer = self.committer
0.5.56 by John Arbash Meinel
A couple more fixups, it seems actually capable now of writing out a changeset, and reading it back.
133
            self.real_revisions.append(rev.as_revision())
134
1185.82.48 by Aaron Bentley
Inching closer to supporting multiple revisions per changeset
135
    def get_base(self, revision):
1185.82.74 by Aaron Bentley
Allow custom base for any revision
136
        revision_info = self.get_revision_info(revision.revision_id)
137
        if revision_info.base_id is not None:
138
            if revision_info.base_id == NULL_REVISION:
139
                return None
140
            else:
141
                return revision_info.base_id
1185.82.48 by Aaron Bentley
Inching closer to supporting multiple revisions per changeset
142
        if len(revision.parent_ids) == 0:
143
            # There is no base listed, and
144
            # the lowest revision doesn't have a parent
145
            # so this is probably against the empty tree
146
            # and thus base truly is None
147
            return None
148
        else:
1185.82.73 by Aaron Bentley
Use rightmost parent always
149
            return revision.parent_ids[-1]
0.5.56 by John Arbash Meinel
A couple more fixups, it seems actually capable now of writing out a changeset, and reading it back.
150
0.5.67 by John Arbash Meinel
Working on apply_changeset
151
    def _get_target(self):
0.5.81 by John Arbash Meinel
Cleaning up from pychecker.
152
        """Return the target revision."""
0.5.67 by John Arbash Meinel
Working on apply_changeset
153
        if len(self.real_revisions) > 0:
1185.82.48 by Aaron Bentley
Inching closer to supporting multiple revisions per changeset
154
            return self.real_revisions[0].revision_id
0.5.67 by John Arbash Meinel
Working on apply_changeset
155
        elif len(self.revisions) > 0:
1185.82.48 by Aaron Bentley
Inching closer to supporting multiple revisions per changeset
156
            return self.revisions[0].revision_id
0.5.67 by John Arbash Meinel
Working on apply_changeset
157
        return None
158
159
    target = property(_get_target, doc='The target revision id')
160
1185.82.49 by Aaron Bentley
SPOT fixes, fix inventory validation
161
    def get_revision(self, revision_id):
162
        for r in self.real_revisions:
163
            if r.revision_id == revision_id:
164
                return r
165
        raise KeyError(revision_id)
166
167
    def get_revision_info(self, revision_id):
168
        for r in self.revisions:
169
            if r.revision_id == revision_id:
170
                return r
171
        raise KeyError(revision_id)
172
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
173
    def revision_tree(self, repository, revision_id, base=None):
174
        revision = self.get_revision(revision_id)
175
        base = self.get_base(revision)
176
        assert base != revision_id
177
        self._validate_references_from_repository(repository)
178
        revision_info = self.get_revision_info(revision_id)
179
        inventory_revision_id = revision_id
180
        bundle_tree = BundleTree(repository.revision_tree(base), 
181
                                  inventory_revision_id)
182
        self._update_tree(bundle_tree, revision_id)
183
184
        inv = bundle_tree.inventory
185
        self._validate_inventory(inv, revision_id)
186
        self._validate_revision(inv, revision_id)
187
188
        return bundle_tree
0.5.62 by John Arbash Meinel
Doing some internal validation before allowing processing to continue, additional checks at the command level.
189
1185.82.15 by Aaron Bentley
Disabled validate_revisions (needs info it doesn't have), updated API to repos
190
    def _validate_references_from_repository(self, repository):
191
        """Now that we have a repository which should have some of the
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
192
        revisions we care about, go through and validate all of them
193
        that we can.
194
        """
195
        rev_to_sha = {}
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
196
        inv_to_sha = {}
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
197
        def add_sha(d, revision_id, sha1):
198
            if revision_id is None:
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
199
                if sha1 is not None:
200
                    raise BzrError('A Null revision should always'
201
                        'have a null sha1 hash')
202
                return
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
203
            if revision_id in d:
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
204
                # This really should have been validated as part
205
                # of _validate_revisions but lets do it again
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
206
                if sha1 != d[revision_id]:
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
207
                    raise BzrError('** Revision %r referenced with 2 different'
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
208
                            ' sha hashes %s != %s' % (revision_id,
209
                                sha1, d[revision_id]))
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
210
            else:
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
211
                d[revision_id] = sha1
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
212
213
        # All of the contained revisions were checked
214
        # in _validate_revisions
215
        checked = {}
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
216
        for rev_info in self.revisions:
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
217
            checked[rev_info.revision_id] = True
218
            add_sha(rev_to_sha, rev_info.revision_id, rev_info.sha1)
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
219
                
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
220
        for (rev, rev_info) in zip(self.real_revisions, self.revisions):
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
221
            add_sha(inv_to_sha, rev_info.revision_id, rev_info.inventory_sha1)
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
222
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
223
        count = 0
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
224
        missing = {}
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
225
        for revision_id, sha1 in rev_to_sha.iteritems():
1185.82.15 by Aaron Bentley
Disabled validate_revisions (needs info it doesn't have), updated API to repos
226
            if repository.has_revision(revision_id):
1185.82.121 by Aaron Bentley
Move calculation of Testament sha1s to Testament
227
                testament = StrictTestament.from_revision(repository, 
228
                                                          revision_id)
1910.2.55 by Aaron Bentley
Bundle 0.9 uses Testament 3 strict
229
                local_sha1 = self._testament_sha1_from_revision(repository,
230
                                                                revision_id)
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
231
                if sha1 != local_sha1:
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
232
                    raise BzrError('sha1 mismatch. For revision id {%s}' 
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
233
                            'local: %s, bundle: %s' % (revision_id, local_sha1, sha1))
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
234
                else:
235
                    count += 1
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
236
            elif revision_id not in checked:
237
                missing[revision_id] = sha1
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
238
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
239
        for inv_id, sha1 in inv_to_sha.iteritems():
1185.82.15 by Aaron Bentley
Disabled validate_revisions (needs info it doesn't have), updated API to repos
240
            if repository.has_revision(inv_id):
1185.82.123 by Aaron Bentley
Cleanups to prepare for review
241
                # Note: branch.get_inventory_sha1() just returns the value that
242
                # is stored in the revision text, and that value may be out
243
                # of date. This is bogus, because that means we aren't
244
                # validating the actual text, just that we wrote and read the
245
                # string. But for now, what the hell.
1185.82.15 by Aaron Bentley
Disabled validate_revisions (needs info it doesn't have), updated API to repos
246
                local_sha1 = repository.get_inventory_sha1(inv_id)
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
247
                if sha1 != local_sha1:
248
                    raise BzrError('sha1 mismatch. For inventory id {%s}' 
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
249
                                   'local: %s, bundle: %s' % 
250
                                   (inv_id, local_sha1, sha1))
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
251
                else:
252
                    count += 1
253
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
254
        if len(missing) > 0:
255
            # I don't know if this is an error yet
256
            warning('Not all revision hashes could be validated.'
257
                    ' Unable validate %d hashes' % len(missing))
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
258
        mutter('Verified %d sha hashes for the bundle.' % count)
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
259
1185.82.49 by Aaron Bentley
SPOT fixes, fix inventory validation
260
    def _validate_inventory(self, inv, revision_id):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
261
        """At this point we should have generated the BundleTree,
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
262
        so build up an inventory, and make sure the hashes match.
263
        """
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
264
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
265
        assert inv is not None
266
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
267
        # Now we should have a complete inventory entry.
0.5.117 by John Arbash Meinel
Almost there. Just need to track down a few remaining bugs.
268
        s = serializer_v5.write_inventory_to_string(inv)
269
        sha1 = sha_string(s)
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
270
        # Target revision is the last entry in the real_revisions list
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
271
        rev = self.get_revision(revision_id)
1185.82.49 by Aaron Bentley
SPOT fixes, fix inventory validation
272
        assert rev.revision_id == revision_id
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
273
        if sha1 != rev.inventory_sha1:
0.5.117 by John Arbash Meinel
Almost there. Just need to track down a few remaining bugs.
274
            open(',,bogus-inv', 'wb').write(s)
1185.82.61 by Aaron Bentley
Downgrade inventory mismatch to warning (source can be inaccurate)
275
            warning('Inventory sha hash mismatch for revision %s. %s'
276
                    ' != %s' % (revision_id, sha1, rev.inventory_sha1))
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
277
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
278
    def _validate_revision(self, inventory, revision_id):
279
        """Make sure all revision entries match their checksum."""
280
281
        # This is a mapping from each revision id to it's sha hash
282
        rev_to_sha1 = {}
283
        
284
        rev = self.get_revision(revision_id)
285
        rev_info = self.get_revision_info(revision_id)
286
        assert rev.revision_id == rev_info.revision_id
287
        assert rev.revision_id == revision_id
1910.2.55 by Aaron Bentley
Bundle 0.9 uses Testament 3 strict
288
        sha1 = self._testament_sha1(rev, inventory)
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
289
        if sha1 != rev_info.sha1:
290
            raise TestamentMismatch(rev.revision_id, rev_info.sha1, sha1)
1963.2.1 by Robey Pointer
remove usage of has_key()
291
        if rev.revision_id in rev_to_sha1:
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
292
            raise BzrError('Revision {%s} given twice in the list'
293
                    % (rev.revision_id))
294
        rev_to_sha1[rev.revision_id] = sha1
295
296
    def _update_tree(self, bundle_tree, revision_id):
297
        """This fills out a BundleTree based on the information
298
        that was read in.
299
300
        :param bundle_tree: A BundleTree to update with the new information.
301
        """
302
303
        def get_rev_id(last_changed, path, kind):
304
            if last_changed is not None:
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
305
                changed_revision_id = osutils.safe_revision_id(last_changed)
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
306
            else:
307
                changed_revision_id = revision_id
308
            bundle_tree.note_last_changed(path, changed_revision_id)
309
            return changed_revision_id
310
311
        def extra_info(info, new_path):
312
            last_changed = None
313
            encoding = None
314
            for info_item in info:
315
                try:
316
                    name, value = info_item.split(':', 1)
317
                except ValueError:
318
                    raise 'Value %r has no colon' % info_item
319
                if name == 'last-changed':
320
                    last_changed = value
321
                elif name == 'executable':
322
                    assert value in ('yes', 'no'), value
323
                    val = (value == 'yes')
324
                    bundle_tree.note_executable(new_path, val)
325
                elif name == 'target':
326
                    bundle_tree.note_target(new_path, value)
327
                elif name == 'encoding':
328
                    encoding = value
329
            return last_changed, encoding
330
331
        def do_patch(path, lines, encoding):
332
            if encoding is not None:
333
                assert encoding == 'base64'
334
                patch = base64.decodestring(''.join(lines))
335
            else:
336
                patch =  ''.join(lines)
337
            bundle_tree.note_patch(path, patch)
338
339
        def renamed(kind, extra, lines):
340
            info = extra.split(' // ')
341
            if len(info) < 2:
342
                raise BzrError('renamed action lines need both a from and to'
343
                        ': %r' % extra)
344
            old_path = info[0]
345
            if info[1].startswith('=> '):
346
                new_path = info[1][3:]
347
            else:
348
                new_path = info[1]
349
350
            bundle_tree.note_rename(old_path, new_path)
351
            last_modified, encoding = extra_info(info[2:], new_path)
352
            revision = get_rev_id(last_modified, new_path, kind)
353
            if lines:
354
                do_patch(new_path, lines, encoding)
355
356
        def removed(kind, extra, lines):
357
            info = extra.split(' // ')
358
            if len(info) > 1:
359
                # TODO: in the future we might allow file ids to be
360
                # given for removed entries
361
                raise BzrError('removed action lines should only have the path'
362
                        ': %r' % extra)
363
            path = info[0]
364
            bundle_tree.note_deletion(path)
365
366
        def added(kind, extra, lines):
367
            info = extra.split(' // ')
368
            if len(info) <= 1:
369
                raise BzrError('add action lines require the path and file id'
370
                        ': %r' % extra)
371
            elif len(info) > 5:
372
                raise BzrError('add action lines have fewer than 5 entries.'
373
                        ': %r' % extra)
374
            path = info[0]
375
            if not info[1].startswith('file-id:'):
376
                raise BzrError('The file-id should follow the path for an add'
377
                        ': %r' % extra)
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
378
            # This will be Unicode because of how the stream is read. Turn it
379
            # back into a utf8 file_id
380
            file_id = osutils.safe_file_id(info[1][8:])
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
381
382
            bundle_tree.note_id(file_id, path, kind)
383
            # this will be overridden in extra_info if executable is specified.
384
            bundle_tree.note_executable(path, False)
385
            last_changed, encoding = extra_info(info[2:], path)
386
            revision = get_rev_id(last_changed, path, kind)
387
            if kind == 'directory':
388
                return
389
            do_patch(path, lines, encoding)
390
391
        def modified(kind, extra, lines):
392
            info = extra.split(' // ')
393
            if len(info) < 1:
394
                raise BzrError('modified action lines have at least'
395
                        'the path in them: %r' % extra)
396
            path = info[0]
397
398
            last_modified, encoding = extra_info(info[1:], path)
399
            revision = get_rev_id(last_modified, path, kind)
400
            if lines:
401
                do_patch(path, lines, encoding)
402
            
403
        valid_actions = {
404
            'renamed':renamed,
405
            'removed':removed,
406
            'added':added,
407
            'modified':modified
408
        }
409
        for action_line, lines in \
410
            self.get_revision_info(revision_id).tree_actions:
411
            first = action_line.find(' ')
412
            if first == -1:
413
                raise BzrError('Bogus action line'
414
                        ' (no opening space): %r' % action_line)
415
            second = action_line.find(' ', first+1)
416
            if second == -1:
417
                raise BzrError('Bogus action line'
418
                        ' (missing second space): %r' % action_line)
419
            action = action_line[:first]
420
            kind = action_line[first+1:second]
421
            if kind not in ('file', 'directory', 'symlink'):
422
                raise BzrError('Bogus action line'
423
                        ' (invalid object kind %r): %r' % (kind, action_line))
424
            extra = action_line[second+1:]
425
426
            if action not in valid_actions:
427
                raise BzrError('Bogus action line'
428
                        ' (unrecognized action): %r' % action_line)
429
            valid_actions[action](kind, extra, lines)
430
431
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
432
class BundleTree(Tree):
1185.82.16 by Aaron Bentley
Ensured revision ID is stored in ChangesetTree inventories
433
    def __init__(self, base_tree, revision_id):
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
434
        self.base_tree = base_tree
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
435
        self._renamed = {} # Mapping from old_path => new_path
436
        self._renamed_r = {} # new_path => old_path
437
        self._new_id = {} # new_path => new_id
438
        self._new_id_r = {} # new_id => new_path
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
439
        self._kinds = {} # new_id => kind
0.5.118 by John Arbash Meinel
Got most of test_changeset to work. Still needs work for Aaron's test code.
440
        self._last_changed = {} # new_id => revision_id
1185.82.66 by Aaron Bentley
Handle new executable files
441
        self._executable = {} # new_id => executable value
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
442
        self.patches = {}
1185.82.87 by Aaron Bentley
Got symlink adding working
443
        self._targets = {} # new path => new symlink target
0.5.48 by aaron.bentley at utoronto
Implemented deletion for ChangesetTrees
444
        self.deleted = []
0.5.52 by aaron.bentley at utoronto
Make contents-addressing configurable
445
        self.contents_by_id = True
1185.82.16 by Aaron Bentley
Ensured revision ID is stored in ChangesetTree inventories
446
        self.revision_id = revision_id
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
447
        self._inventory = None
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
448
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
449
    def __str__(self):
450
        return pprint.pformat(self.__dict__)
451
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
452
    def note_rename(self, old_path, new_path):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
453
        """A file/directory has been renamed from old_path => new_path"""
1963.2.1 by Robey Pointer
remove usage of has_key()
454
        assert new_path not in self._renamed
455
        assert old_path not in self._renamed_r
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
456
        self._renamed[new_path] = old_path
457
        self._renamed_r[old_path] = new_path
458
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
459
    def note_id(self, new_id, new_path, kind='file'):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
460
        """Files that don't exist in base need a new id."""
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
461
        self._new_id[new_path] = new_id
462
        self._new_id_r[new_id] = new_path
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
463
        self._kinds[new_id] = kind
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
464
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
465
    def note_last_changed(self, file_id, revision_id):
1963.2.1 by Robey Pointer
remove usage of has_key()
466
        if (file_id in self._last_changed
0.5.118 by John Arbash Meinel
Got most of test_changeset to work. Still needs work for Aaron's test code.
467
                and self._last_changed[file_id] != revision_id):
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
468
            raise BzrError('Mismatched last-changed revision for file_id {%s}'
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
469
                    ': %s != %s' % (file_id,
0.5.118 by John Arbash Meinel
Got most of test_changeset to work. Still needs work for Aaron's test code.
470
                                    self._last_changed[file_id],
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
471
                                    revision_id))
0.5.118 by John Arbash Meinel
Got most of test_changeset to work. Still needs work for Aaron's test code.
472
        self._last_changed[file_id] = revision_id
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
473
0.5.44 by aaron.bentley at utoronto
Got get_file working for new files
474
    def note_patch(self, new_path, patch):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
475
        """There is a patch for a given filename."""
1731.1.55 by Aaron Bentley
Fix bundle handling
476
        self.patches[new_path] = patch
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
477
1185.82.87 by Aaron Bentley
Got symlink adding working
478
    def note_target(self, new_path, target):
479
        """The symlink at the new path has the given target"""
1731.1.55 by Aaron Bentley
Fix bundle handling
480
        self._targets[new_path] = target
1185.82.87 by Aaron Bentley
Got symlink adding working
481
0.5.48 by aaron.bentley at utoronto
Implemented deletion for ChangesetTrees
482
    def note_deletion(self, old_path):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
483
        """The file at old_path has been deleted."""
1731.1.55 by Aaron Bentley
Fix bundle handling
484
        self.deleted.append(old_path)
0.5.48 by aaron.bentley at utoronto
Implemented deletion for ChangesetTrees
485
1185.82.66 by Aaron Bentley
Handle new executable files
486
    def note_executable(self, new_path, executable):
1731.1.55 by Aaron Bentley
Fix bundle handling
487
        self._executable[new_path] = executable
1185.82.66 by Aaron Bentley
Handle new executable files
488
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
489
    def old_path(self, new_path):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
490
        """Get the old_path (path in the base_tree) for the file at new_path"""
0.6.1 by Aaron Bentley
Fleshed out MockTree, fixed all test failures
491
        assert new_path[:1] not in ('\\', '/')
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
492
        old_path = self._renamed.get(new_path)
493
        if old_path is not None:
494
            return old_path
495
        dirname,basename = os.path.split(new_path)
0.5.56 by John Arbash Meinel
A couple more fixups, it seems actually capable now of writing out a changeset, and reading it back.
496
        # dirname is not '' doesn't work, because
497
        # dirname may be a unicode entry, and is
498
        # requires the objects to be identical
499
        if dirname != '':
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
500
            old_dir = self.old_path(dirname)
501
            if old_dir is None:
0.5.42 by aaron.bentley at utoronto
Improved rename handling
502
                old_path = None
503
            else:
1711.4.19 by John Arbash Meinel
Bundles were still using os.path.join to compute paths rather than osutils.pathjoin
504
                old_path = pathjoin(old_dir, basename)
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
505
        else:
0.5.42 by aaron.bentley at utoronto
Improved rename handling
506
            old_path = new_path
507
        #If the new path wasn't in renamed, the old one shouldn't be in
508
        #renamed_r
1963.2.1 by Robey Pointer
remove usage of has_key()
509
        if old_path in self._renamed_r:
0.5.42 by aaron.bentley at utoronto
Improved rename handling
510
            return None
511
        return old_path 
512
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
513
    def new_path(self, old_path):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
514
        """Get the new_path (path in the target_tree) for the file at old_path
515
        in the base tree.
516
        """
0.6.1 by Aaron Bentley
Fleshed out MockTree, fixed all test failures
517
        assert old_path[:1] not in ('\\', '/')
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
518
        new_path = self._renamed_r.get(old_path)
519
        if new_path is not None:
520
            return new_path
1963.2.1 by Robey Pointer
remove usage of has_key()
521
        if new_path in self._renamed:
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
522
            return None
523
        dirname,basename = os.path.split(old_path)
0.5.81 by John Arbash Meinel
Cleaning up from pychecker.
524
        if dirname != '':
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
525
            new_dir = self.new_path(dirname)
526
            if new_dir is None:
0.5.42 by aaron.bentley at utoronto
Improved rename handling
527
                new_path = None
528
            else:
1711.4.19 by John Arbash Meinel
Bundles were still using os.path.join to compute paths rather than osutils.pathjoin
529
                new_path = pathjoin(new_dir, basename)
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
530
        else:
0.5.42 by aaron.bentley at utoronto
Improved rename handling
531
            new_path = old_path
532
        #If the old path wasn't in renamed, the new one shouldn't be in
533
        #renamed_r
1963.2.1 by Robey Pointer
remove usage of has_key()
534
        if new_path in self._renamed:
0.5.42 by aaron.bentley at utoronto
Improved rename handling
535
            return None
536
        return new_path 
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
537
538
    def path2id(self, path):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
539
        """Return the id of the file present at path in the target tree."""
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
540
        file_id = self._new_id.get(path)
541
        if file_id is not None:
542
            return file_id
0.5.43 by aaron.bentley at utoronto
Handled moves and adds properly
543
        old_path = self.old_path(path)
544
        if old_path is None:
545
            return None
0.5.48 by aaron.bentley at utoronto
Implemented deletion for ChangesetTrees
546
        if old_path in self.deleted:
547
            return None
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
548
        if getattr(self.base_tree, 'path2id', None) is not None:
0.5.66 by John Arbash Meinel
Refactoring, moving test code into test (switching back to assert is None)
549
            return self.base_tree.path2id(old_path)
550
        else:
551
            return self.base_tree.inventory.path2id(old_path)
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
552
553
    def id2path(self, file_id):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
554
        """Return the new path in the target tree of the file with id file_id"""
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
555
        path = self._new_id_r.get(file_id)
556
        if path is not None:
557
            return path
0.5.43 by aaron.bentley at utoronto
Handled moves and adds properly
558
        old_path = self.base_tree.id2path(file_id)
559
        if old_path is None:
560
            return None
0.5.48 by aaron.bentley at utoronto
Implemented deletion for ChangesetTrees
561
        if old_path in self.deleted:
562
            return None
0.5.43 by aaron.bentley at utoronto
Handled moves and adds properly
563
        return self.new_path(old_path)
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
564
0.5.52 by aaron.bentley at utoronto
Make contents-addressing configurable
565
    def old_contents_id(self, file_id):
1185.82.94 by Aaron Bentley
Remove old chatter
566
        """Return the id in the base_tree for the given file_id.
567
        Return None if the file did not exist in base.
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
568
        """
0.5.52 by aaron.bentley at utoronto
Make contents-addressing configurable
569
        if self.contents_by_id:
570
            if self.base_tree.has_id(file_id):
571
                return file_id
572
            else:
573
                return None
574
        new_path = self.id2path(file_id)
575
        return self.base_tree.path2id(new_path)
576
        
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
577
    def get_file(self, file_id):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
578
        """Return a file-like object containing the new contents of the
579
        file given by file_id.
580
581
        TODO:   It might be nice if this actually generated an entry
582
                in the text-store, so that the file contents would
583
                then be cached.
584
        """
0.5.52 by aaron.bentley at utoronto
Make contents-addressing configurable
585
        base_id = self.old_contents_id(file_id)
1910.2.64 by Aaron Bentley
Changes from review
586
        if (base_id is not None and
1910.2.58 by Aaron Bentley
Stop using get_revision_id to make bundles
587
            base_id != self.base_tree.inventory.root.file_id):
0.5.50 by aaron.bentley at utoronto
Evaluate patches against file paths, not file ids
588
            patch_original = self.base_tree.get_file(base_id)
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
589
        else:
590
            patch_original = None
0.5.52 by aaron.bentley at utoronto
Make contents-addressing configurable
591
        file_patch = self.patches.get(self.id2path(file_id))
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
592
        if file_patch is None:
1185.82.42 by Aaron Bentley
Handle new directories properly
593
            if (patch_original is None and 
594
                self.get_kind(file_id) == 'directory'):
595
                return StringIO()
596
            assert patch_original is not None, "None: %s" % file_id
0.5.44 by aaron.bentley at utoronto
Got get_file working for new files
597
            return patch_original
0.5.94 by Aaron Bentley
Switched to native patch application, added tests for terminating newlines
598
599
        assert not file_patch.startswith('\\'), \
600
            'Malformed patch for %s, %r' % (file_id, file_patch)
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
601
        return patched_file(file_patch, patch_original)
602
1185.82.87 by Aaron Bentley
Got symlink adding working
603
    def get_symlink_target(self, file_id):
604
        new_path = self.id2path(file_id)
605
        try:
606
            return self._targets[new_path]
607
        except KeyError:
608
            return self.base_tree.get_symlink_target(file_id)
609
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
610
    def get_kind(self, file_id):
611
        if file_id in self._kinds:
612
            return self._kinds[file_id]
613
        return self.base_tree.inventory[file_id].kind
614
1185.82.66 by Aaron Bentley
Handle new executable files
615
    def is_executable(self, file_id):
1185.82.93 by Aaron Bentley
Code cleanup
616
        path = self.id2path(file_id)
617
        if path in self._executable:
618
            return self._executable[path]
1185.82.66 by Aaron Bentley
Handle new executable files
619
        else:
620
            return self.base_tree.inventory[file_id].executable
621
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
622
    def get_last_changed(self, file_id):
1185.82.95 by Aaron Bentley
Restore path-orientation of ChangesetTree
623
        path = self.id2path(file_id)
624
        if path in self._last_changed:
625
            return self._last_changed[path]
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
626
        return self.base_tree.inventory[file_id].revision
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
627
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
628
    def get_size_and_sha1(self, file_id):
629
        """Return the size and sha1 hash of the given file id.
630
        If the file was not locally modified, this is extracted
631
        from the base_tree. Rather than re-reading the file.
632
        """
633
        new_path = self.id2path(file_id)
634
        if new_path is None:
635
            return None, None
636
        if new_path not in self.patches:
637
            # If the entry does not have a patch, then the
638
            # contents must be the same as in the base_tree
639
            ie = self.base_tree.inventory[file_id]
0.5.69 by John Arbash Meinel
Applying patch from Robey Pointer to clean up apply_changeset.
640
            if ie.text_size is None:
641
                return ie.text_size, ie.text_sha1
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
642
            return int(ie.text_size), ie.text_sha1
0.5.94 by Aaron Bentley
Switched to native patch application, added tests for terminating newlines
643
        fileobj = self.get_file(file_id)
644
        content = fileobj.read()
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
645
        return len(content), sha_string(content)
646
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
647
    def _get_inventory(self):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
648
        """Build up the inventory entry for the BundleTree.
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
649
650
        This need to be called before ever accessing self.inventory
651
        """
652
        from os.path import dirname, basename
653
654
        assert self.base_tree is not None
655
        base_inv = self.base_tree.inventory
1731.1.62 by Aaron Bentley
Changes from review comments
656
        inv = Inventory(None, self.revision_id)
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
657
658
        def add_entry(file_id):
659
            path = self.id2path(file_id)
660
            if path is None:
661
                return
1731.1.55 by Aaron Bentley
Fix bundle handling
662
            if path == '':
663
                parent_id = None
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
664
            else:
1731.1.55 by Aaron Bentley
Fix bundle handling
665
                parent_path = dirname(path)
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
666
                parent_id = self.path2id(parent_path)
667
668
            kind = self.get_kind(file_id)
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
669
            revision_id = self.get_last_changed(file_id)
0.5.83 by John Arbash Meinel
Tests pass. Now ChangesetTree has it's own inventory.
670
671
            name = basename(path)
0.5.116 by John Arbash Meinel
Fixed a bug based on the new InventoryEntry separation.
672
            if kind == 'directory':
673
                ie = InventoryDirectory(file_id, name, parent_id)
674
            elif kind == 'file':
675
                ie = InventoryFile(file_id, name, parent_id)
1185.82.66 by Aaron Bentley
Handle new executable files
676
                ie.executable = self.is_executable(file_id)
0.5.116 by John Arbash Meinel
Fixed a bug based on the new InventoryEntry separation.
677
            elif kind == 'symlink':
678
                ie = InventoryLink(file_id, name, parent_id)
1185.82.87 by Aaron Bentley
Got symlink adding working
679
                ie.symlink_target = self.get_symlink_target(file_id)
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
680
            ie.revision = revision_id
681
1185.82.88 by Aaron Bentley
Get symlink modification, renames and deletion under test
682
            if kind in ('directory', 'symlink'):
0.5.83 by John Arbash Meinel
Tests pass. Now ChangesetTree has it's own inventory.
683
                ie.text_size, ie.text_sha1 = None, None
684
            else:
685
                ie.text_size, ie.text_sha1 = self.get_size_and_sha1(file_id)
1185.82.88 by Aaron Bentley
Get symlink modification, renames and deletion under test
686
            if (ie.text_size is None) and (kind == 'file'):
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
687
                raise BzrError('Got a text_size of None for file_id %r' % file_id)
688
            inv.add(ie)
689
0.6.1 by Aaron Bentley
Fleshed out MockTree, fixed all test failures
690
        sorted_entries = self.sorted_path_id()
691
        for path, file_id in sorted_entries:
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
692
            add_entry(file_id)
693
694
        return inv
695
696
    # Have to overload the inherited inventory property
697
    # because _get_inventory is only called in the parent.
698
    # Reading the docs, property() objects do not use
699
    # overloading, they use the function as it was defined
700
    # at that instant
701
    inventory = property(_get_inventory)
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
702
0.5.49 by aaron.bentley at utoronto
Implemented iteration over ids
703
    def __iter__(self):
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
704
        for path, entry in self.inventory.iter_entries():
0.5.69 by John Arbash Meinel
Applying patch from Robey Pointer to clean up apply_changeset.
705
            yield entry.file_id
0.5.49 by aaron.bentley at utoronto
Implemented iteration over ids
706
0.6.1 by Aaron Bentley
Fleshed out MockTree, fixed all test failures
707
    def sorted_path_id(self):
708
        paths = []
709
        for result in self._new_id.iteritems():
710
            paths.append(result)
711
        for id in self.base_tree:
712
            path = self.id2path(id)
713
            if path is None:
714
                continue
715
            paths.append((path, id))
716
        paths.sort()
717
        return paths
718
1185.82.123 by Aaron Bentley
Cleanups to prepare for review
719
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
720
def patched_file(file_patch, original):
0.5.94 by Aaron Bentley
Switched to native patch application, added tests for terminating newlines
721
    """Produce a file-like object with the patched version of a text"""
1185.82.13 by Aaron Bentley
Got old changeset tests running
722
    from bzrlib.patches import iter_patched
723
    from bzrlib.iterablefile import IterableFile
0.5.94 by Aaron Bentley
Switched to native patch application, added tests for terminating newlines
724
    if file_patch == "":
725
        return IterableFile(())
1848.1.1 by John Arbash Meinel
fix bug in bundle handling of binary files with just '\r' in them.
726
    # string.splitlines(True) also splits on '\r', but the iter_patched code
727
    # only expects to iterate over '\n' style lines
728
    return IterableFile(iter_patched(original,
729
                StringIO(file_patch).readlines()))