~bzr-pqm/bzr/bzr.dev

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