~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
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
263
        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
264
            if repository.has_revision(inv_id):
1185.82.123 by Aaron Bentley
Cleanups to prepare for review
265
                # Note: branch.get_inventory_sha1() just returns the value that
266
                # is stored in the revision text, and that value may be out
267
                # of date. This is bogus, because that means we aren't
268
                # validating the actual text, just that we wrote and read the
269
                # 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
270
                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.
271
                if sha1 != local_sha1:
272
                    raise BzrError('sha1 mismatch. For inventory id {%s}' 
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
273
                                   'local: %s, bundle: %s' % 
274
                                   (inv_id, local_sha1, sha1))
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
275
                else:
276
                    count += 1
277
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
278
        if len(missing) > 0:
279
            # I don't know if this is an error yet
280
            warning('Not all revision hashes could be validated.'
281
                    ' Unable validate %d hashes' % len(missing))
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
282
        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
283
        self._validated_revisions_against_repo = True
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
284
1185.82.49 by Aaron Bentley
SPOT fixes, fix inventory validation
285
    def _validate_inventory(self, inv, revision_id):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
286
        """At this point we should have generated the BundleTree,
0.5.63 by John Arbash Meinel
Moving the validation into part of the reading.
287
        so build up an inventory, and make sure the hashes match.
288
        """
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
289
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
290
        assert inv is not None
291
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
292
        # 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.
293
        s = serializer_v5.write_inventory_to_string(inv)
294
        sha1 = sha_string(s)
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
295
        # Target revision is the last entry in the real_revisions list
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
296
        rev = self.get_revision(revision_id)
1185.82.49 by Aaron Bentley
SPOT fixes, fix inventory validation
297
        assert rev.revision_id == revision_id
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
298
        if sha1 != rev.inventory_sha1:
0.5.117 by John Arbash Meinel
Almost there. Just need to track down a few remaining bugs.
299
            open(',,bogus-inv', 'wb').write(s)
1185.82.61 by Aaron Bentley
Downgrade inventory mismatch to warning (source can be inaccurate)
300
            warning('Inventory sha hash mismatch for revision %s. %s'
301
                    ' != %s' % (revision_id, sha1, rev.inventory_sha1))
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
302
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
303
    def _validate_revision(self, inventory, revision_id):
304
        """Make sure all revision entries match their checksum."""
305
306
        # This is a mapping from each revision id to it's sha hash
307
        rev_to_sha1 = {}
308
        
309
        rev = self.get_revision(revision_id)
310
        rev_info = self.get_revision_info(revision_id)
311
        assert rev.revision_id == rev_info.revision_id
312
        assert rev.revision_id == revision_id
1910.2.55 by Aaron Bentley
Bundle 0.9 uses Testament 3 strict
313
        sha1 = self._testament_sha1(rev, inventory)
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
314
        if sha1 != rev_info.sha1:
315
            raise TestamentMismatch(rev.revision_id, rev_info.sha1, sha1)
1963.2.1 by Robey Pointer
remove usage of has_key()
316
        if rev.revision_id in rev_to_sha1:
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
317
            raise BzrError('Revision {%s} given twice in the list'
318
                    % (rev.revision_id))
319
        rev_to_sha1[rev.revision_id] = sha1
320
321
    def _update_tree(self, bundle_tree, revision_id):
322
        """This fills out a BundleTree based on the information
323
        that was read in.
324
325
        :param bundle_tree: A BundleTree to update with the new information.
326
        """
327
328
        def get_rev_id(last_changed, path, kind):
329
            if last_changed is not None:
2309.4.5 by John Arbash Meinel
Change bundle_data to use the sanitizing form of safe_*_id
330
                # last_changed will be a Unicode string because of how it was
331
                # read. Convert it back to utf8.
332
                changed_revision_id = osutils.safe_revision_id(last_changed,
333
                                                               warn=False)
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
334
            else:
335
                changed_revision_id = revision_id
336
            bundle_tree.note_last_changed(path, changed_revision_id)
337
            return changed_revision_id
338
339
        def extra_info(info, new_path):
340
            last_changed = None
341
            encoding = None
342
            for info_item in info:
343
                try:
344
                    name, value = info_item.split(':', 1)
345
                except ValueError:
346
                    raise 'Value %r has no colon' % info_item
347
                if name == 'last-changed':
348
                    last_changed = value
349
                elif name == 'executable':
350
                    assert value in ('yes', 'no'), value
351
                    val = (value == 'yes')
352
                    bundle_tree.note_executable(new_path, val)
353
                elif name == 'target':
354
                    bundle_tree.note_target(new_path, value)
355
                elif name == 'encoding':
356
                    encoding = value
357
            return last_changed, encoding
358
359
        def do_patch(path, lines, encoding):
360
            if encoding is not None:
361
                assert encoding == 'base64'
362
                patch = base64.decodestring(''.join(lines))
363
            else:
364
                patch =  ''.join(lines)
365
            bundle_tree.note_patch(path, patch)
366
367
        def renamed(kind, extra, lines):
368
            info = extra.split(' // ')
369
            if len(info) < 2:
370
                raise BzrError('renamed action lines need both a from and to'
371
                        ': %r' % extra)
372
            old_path = info[0]
373
            if info[1].startswith('=> '):
374
                new_path = info[1][3:]
375
            else:
376
                new_path = info[1]
377
378
            bundle_tree.note_rename(old_path, new_path)
379
            last_modified, encoding = extra_info(info[2:], new_path)
380
            revision = get_rev_id(last_modified, new_path, kind)
381
            if lines:
382
                do_patch(new_path, lines, encoding)
383
384
        def removed(kind, extra, lines):
385
            info = extra.split(' // ')
386
            if len(info) > 1:
387
                # TODO: in the future we might allow file ids to be
388
                # given for removed entries
389
                raise BzrError('removed action lines should only have the path'
390
                        ': %r' % extra)
391
            path = info[0]
392
            bundle_tree.note_deletion(path)
393
394
        def added(kind, extra, lines):
395
            info = extra.split(' // ')
396
            if len(info) <= 1:
397
                raise BzrError('add action lines require the path and file id'
398
                        ': %r' % extra)
399
            elif len(info) > 5:
400
                raise BzrError('add action lines have fewer than 5 entries.'
401
                        ': %r' % extra)
402
            path = info[0]
403
            if not info[1].startswith('file-id:'):
404
                raise BzrError('The file-id should follow the path for an add'
405
                        ': %r' % extra)
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
406
            # This will be Unicode because of how the stream is read. Turn it
407
            # back into a utf8 file_id
2309.4.5 by John Arbash Meinel
Change bundle_data to use the sanitizing form of safe_*_id
408
            file_id = osutils.safe_file_id(info[1][8:], warn=False)
1793.2.1 by Aaron Bentley
Move revision_tree into BundleInfo
409
410
            bundle_tree.note_id(file_id, path, kind)
411
            # this will be overridden in extra_info if executable is specified.
412
            bundle_tree.note_executable(path, False)
413
            last_changed, encoding = extra_info(info[2:], path)
414
            revision = get_rev_id(last_changed, path, kind)
415
            if kind == 'directory':
416
                return
417
            do_patch(path, lines, encoding)
418
419
        def modified(kind, extra, lines):
420
            info = extra.split(' // ')
421
            if len(info) < 1:
422
                raise BzrError('modified action lines have at least'
423
                        'the path in them: %r' % extra)
424
            path = info[0]
425
426
            last_modified, encoding = extra_info(info[1:], path)
427
            revision = get_rev_id(last_modified, path, kind)
428
            if lines:
429
                do_patch(path, lines, encoding)
430
            
431
        valid_actions = {
432
            'renamed':renamed,
433
            'removed':removed,
434
            'added':added,
435
            'modified':modified
436
        }
437
        for action_line, lines in \
438
            self.get_revision_info(revision_id).tree_actions:
439
            first = action_line.find(' ')
440
            if first == -1:
441
                raise BzrError('Bogus action line'
442
                        ' (no opening space): %r' % action_line)
443
            second = action_line.find(' ', first+1)
444
            if second == -1:
445
                raise BzrError('Bogus action line'
446
                        ' (missing second space): %r' % action_line)
447
            action = action_line[:first]
448
            kind = action_line[first+1:second]
449
            if kind not in ('file', 'directory', 'symlink'):
450
                raise BzrError('Bogus action line'
451
                        ' (invalid object kind %r): %r' % (kind, action_line))
452
            extra = action_line[second+1:]
453
454
            if action not in valid_actions:
455
                raise BzrError('Bogus action line'
456
                        ' (unrecognized action): %r' % action_line)
457
            valid_actions[action](kind, extra, lines)
458
2520.4.148 by Aaron Bentley
Updates from review
459
    def install_revisions(self, target_repo, stream_input=True):
460
        """Install revisions and return the target revision
461
462
        :param target_repo: The repository to install into
463
        :param stream_input: Ignored by this implementation.
464
        """
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
465
        apply_bundle.install_bundle(target_repo, self)
466
        return self.target
467
2520.4.109 by Aaron Bentley
start work on directive cherry-picking
468
    def get_merge_request(self, target_repo):
469
        """Provide data for performing a merge
470
471
        Returns suggested base, suggested target, and patch verification status
472
        """
473
        return None, self.target, 'inapplicable'
474
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
475
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
476
class BundleTree(Tree):
1185.82.16 by Aaron Bentley
Ensured revision ID is stored in ChangesetTree inventories
477
    def __init__(self, base_tree, revision_id):
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
478
        self.base_tree = base_tree
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
479
        self._renamed = {} # Mapping from old_path => new_path
480
        self._renamed_r = {} # new_path => old_path
481
        self._new_id = {} # new_path => new_id
482
        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.
483
        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.
484
        self._last_changed = {} # new_id => revision_id
1185.82.66 by Aaron Bentley
Handle new executable files
485
        self._executable = {} # new_id => executable value
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
486
        self.patches = {}
1185.82.87 by Aaron Bentley
Got symlink adding working
487
        self._targets = {} # new path => new symlink target
0.5.48 by aaron.bentley at utoronto
Implemented deletion for ChangesetTrees
488
        self.deleted = []
0.5.52 by aaron.bentley at utoronto
Make contents-addressing configurable
489
        self.contents_by_id = True
1185.82.16 by Aaron Bentley
Ensured revision ID is stored in ChangesetTree inventories
490
        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
491
        self._inventory = None
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
492
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
493
    def __str__(self):
494
        return pprint.pformat(self.__dict__)
495
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
496
    def note_rename(self, old_path, new_path):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
497
        """A file/directory has been renamed from old_path => new_path"""
1963.2.1 by Robey Pointer
remove usage of has_key()
498
        assert new_path not in self._renamed
499
        assert old_path not in self._renamed_r
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
500
        self._renamed[new_path] = old_path
501
        self._renamed_r[old_path] = new_path
502
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
503
    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.
504
        """Files that don't exist in base need a new id."""
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
505
        self._new_id[new_path] = new_id
506
        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.
507
        self._kinds[new_id] = kind
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
508
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
509
    def note_last_changed(self, file_id, revision_id):
1963.2.1 by Robey Pointer
remove usage of has_key()
510
        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.
511
                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.
512
            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
513
                    ': %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.
514
                                    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.
515
                                    revision_id))
0.5.118 by John Arbash Meinel
Got most of test_changeset to work. Still needs work for Aaron's test code.
516
        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
517
0.5.44 by aaron.bentley at utoronto
Got get_file working for new files
518
    def note_patch(self, new_path, patch):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
519
        """There is a patch for a given filename."""
1731.1.55 by Aaron Bentley
Fix bundle handling
520
        self.patches[new_path] = patch
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
521
1185.82.87 by Aaron Bentley
Got symlink adding working
522
    def note_target(self, new_path, target):
523
        """The symlink at the new path has the given target"""
1731.1.55 by Aaron Bentley
Fix bundle handling
524
        self._targets[new_path] = target
1185.82.87 by Aaron Bentley
Got symlink adding working
525
0.5.48 by aaron.bentley at utoronto
Implemented deletion for ChangesetTrees
526
    def note_deletion(self, old_path):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
527
        """The file at old_path has been deleted."""
1731.1.55 by Aaron Bentley
Fix bundle handling
528
        self.deleted.append(old_path)
0.5.48 by aaron.bentley at utoronto
Implemented deletion for ChangesetTrees
529
1185.82.66 by Aaron Bentley
Handle new executable files
530
    def note_executable(self, new_path, executable):
1731.1.55 by Aaron Bentley
Fix bundle handling
531
        self._executable[new_path] = executable
1185.82.66 by Aaron Bentley
Handle new executable files
532
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
533
    def old_path(self, new_path):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
534
        """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
535
        assert new_path[:1] not in ('\\', '/')
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
536
        old_path = self._renamed.get(new_path)
537
        if old_path is not None:
538
            return old_path
539
        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.
540
        # dirname is not '' doesn't work, because
541
        # dirname may be a unicode entry, and is
542
        # requires the objects to be identical
543
        if dirname != '':
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
544
            old_dir = self.old_path(dirname)
545
            if old_dir is None:
0.5.42 by aaron.bentley at utoronto
Improved rename handling
546
                old_path = None
547
            else:
1711.4.19 by John Arbash Meinel
Bundles were still using os.path.join to compute paths rather than osutils.pathjoin
548
                old_path = pathjoin(old_dir, basename)
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
549
        else:
0.5.42 by aaron.bentley at utoronto
Improved rename handling
550
            old_path = new_path
551
        #If the new path wasn't in renamed, the old one shouldn't be in
552
        #renamed_r
1963.2.1 by Robey Pointer
remove usage of has_key()
553
        if old_path in self._renamed_r:
0.5.42 by aaron.bentley at utoronto
Improved rename handling
554
            return None
555
        return old_path 
556
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
557
    def new_path(self, old_path):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
558
        """Get the new_path (path in the target_tree) for the file at old_path
559
        in the base tree.
560
        """
0.6.1 by Aaron Bentley
Fleshed out MockTree, fixed all test failures
561
        assert old_path[:1] not in ('\\', '/')
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
562
        new_path = self._renamed_r.get(old_path)
563
        if new_path is not None:
564
            return new_path
1963.2.1 by Robey Pointer
remove usage of has_key()
565
        if new_path in self._renamed:
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
566
            return None
567
        dirname,basename = os.path.split(old_path)
0.5.81 by John Arbash Meinel
Cleaning up from pychecker.
568
        if dirname != '':
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
569
            new_dir = self.new_path(dirname)
570
            if new_dir is None:
0.5.42 by aaron.bentley at utoronto
Improved rename handling
571
                new_path = None
572
            else:
1711.4.19 by John Arbash Meinel
Bundles were still using os.path.join to compute paths rather than osutils.pathjoin
573
                new_path = pathjoin(new_dir, basename)
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
574
        else:
0.5.42 by aaron.bentley at utoronto
Improved rename handling
575
            new_path = old_path
576
        #If the old path wasn't in renamed, the new one shouldn't be in
577
        #renamed_r
1963.2.1 by Robey Pointer
remove usage of has_key()
578
        if new_path in self._renamed:
0.5.42 by aaron.bentley at utoronto
Improved rename handling
579
            return None
580
        return new_path 
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
581
582
    def path2id(self, path):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
583
        """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
584
        file_id = self._new_id.get(path)
585
        if file_id is not None:
586
            return file_id
0.5.43 by aaron.bentley at utoronto
Handled moves and adds properly
587
        old_path = self.old_path(path)
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
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
592
        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)
593
            return self.base_tree.path2id(old_path)
594
        else:
595
            return self.base_tree.inventory.path2id(old_path)
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
596
597
    def id2path(self, file_id):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
598
        """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
599
        path = self._new_id_r.get(file_id)
600
        if path is not None:
601
            return path
0.5.43 by aaron.bentley at utoronto
Handled moves and adds properly
602
        old_path = self.base_tree.id2path(file_id)
603
        if old_path is None:
604
            return None
0.5.48 by aaron.bentley at utoronto
Implemented deletion for ChangesetTrees
605
        if old_path in self.deleted:
606
            return None
0.5.43 by aaron.bentley at utoronto
Handled moves and adds properly
607
        return self.new_path(old_path)
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
608
0.5.52 by aaron.bentley at utoronto
Make contents-addressing configurable
609
    def old_contents_id(self, file_id):
1185.82.94 by Aaron Bentley
Remove old chatter
610
        """Return the id in the base_tree for the given file_id.
611
        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.
612
        """
0.5.52 by aaron.bentley at utoronto
Make contents-addressing configurable
613
        if self.contents_by_id:
614
            if self.base_tree.has_id(file_id):
615
                return file_id
616
            else:
617
                return None
618
        new_path = self.id2path(file_id)
619
        return self.base_tree.path2id(new_path)
620
        
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
621
    def get_file(self, file_id):
0.5.55 by John Arbash Meinel
Lots of updates. Using a minimized annotations for changesets.
622
        """Return a file-like object containing the new contents of the
623
        file given by file_id.
624
625
        TODO:   It might be nice if this actually generated an entry
626
                in the text-store, so that the file contents would
627
                then be cached.
628
        """
0.5.52 by aaron.bentley at utoronto
Make contents-addressing configurable
629
        base_id = self.old_contents_id(file_id)
1910.2.64 by Aaron Bentley
Changes from review
630
        if (base_id is not None and
1910.2.58 by Aaron Bentley
Stop using get_revision_id to make bundles
631
            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
632
            patch_original = self.base_tree.get_file(base_id)
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
633
        else:
634
            patch_original = None
0.5.52 by aaron.bentley at utoronto
Make contents-addressing configurable
635
        file_patch = self.patches.get(self.id2path(file_id))
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
636
        if file_patch is None:
1185.82.42 by Aaron Bentley
Handle new directories properly
637
            if (patch_original is None and 
638
                self.get_kind(file_id) == 'directory'):
639
                return StringIO()
640
            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
641
            return patch_original
0.5.94 by Aaron Bentley
Switched to native patch application, added tests for terminating newlines
642
643
        assert not file_patch.startswith('\\'), \
644
            'Malformed patch for %s, %r' % (file_id, file_patch)
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
645
        return patched_file(file_patch, patch_original)
646
1185.82.87 by Aaron Bentley
Got symlink adding working
647
    def get_symlink_target(self, file_id):
648
        new_path = self.id2path(file_id)
649
        try:
650
            return self._targets[new_path]
651
        except KeyError:
652
            return self.base_tree.get_symlink_target(file_id)
653
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
654
    def get_kind(self, file_id):
655
        if file_id in self._kinds:
656
            return self._kinds[file_id]
657
        return self.base_tree.inventory[file_id].kind
658
1185.82.66 by Aaron Bentley
Handle new executable files
659
    def is_executable(self, file_id):
1185.82.93 by Aaron Bentley
Code cleanup
660
        path = self.id2path(file_id)
661
        if path in self._executable:
662
            return self._executable[path]
1185.82.66 by Aaron Bentley
Handle new executable files
663
        else:
664
            return self.base_tree.inventory[file_id].executable
665
0.5.115 by John Arbash Meinel
Getting closer to being able to read back the changesets, still broken, though.
666
    def get_last_changed(self, file_id):
1185.82.95 by Aaron Bentley
Restore path-orientation of ChangesetTree
667
        path = self.id2path(file_id)
668
        if path in self._last_changed:
669
            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.
670
        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
671
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
672
    def get_size_and_sha1(self, file_id):
673
        """Return the size and sha1 hash of the given file id.
674
        If the file was not locally modified, this is extracted
675
        from the base_tree. Rather than re-reading the file.
676
        """
677
        new_path = self.id2path(file_id)
678
        if new_path is None:
679
            return None, None
680
        if new_path not in self.patches:
681
            # If the entry does not have a patch, then the
682
            # contents must be the same as in the base_tree
683
            ie = self.base_tree.inventory[file_id]
0.5.69 by John Arbash Meinel
Applying patch from Robey Pointer to clean up apply_changeset.
684
            if ie.text_size is None:
685
                return ie.text_size, ie.text_sha1
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
686
            return int(ie.text_size), ie.text_sha1
0.5.94 by Aaron Bentley
Switched to native patch application, added tests for terminating newlines
687
        fileobj = self.get_file(file_id)
688
        content = fileobj.read()
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
689
        return len(content), sha_string(content)
690
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
691
    def _get_inventory(self):
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
692
        """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
693
694
        This need to be called before ever accessing self.inventory
695
        """
696
        from os.path import dirname, basename
697
698
        assert self.base_tree is not None
699
        base_inv = self.base_tree.inventory
1731.1.62 by Aaron Bentley
Changes from review comments
700
        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
701
702
        def add_entry(file_id):
703
            path = self.id2path(file_id)
704
            if path is None:
705
                return
1731.1.55 by Aaron Bentley
Fix bundle handling
706
            if path == '':
707
                parent_id = None
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
708
            else:
1731.1.55 by Aaron Bentley
Fix bundle handling
709
                parent_path = dirname(path)
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
710
                parent_id = self.path2id(parent_path)
711
712
            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.
713
            revision_id = self.get_last_changed(file_id)
0.5.83 by John Arbash Meinel
Tests pass. Now ChangesetTree has it's own inventory.
714
715
            name = basename(path)
0.5.116 by John Arbash Meinel
Fixed a bug based on the new InventoryEntry separation.
716
            if kind == 'directory':
717
                ie = InventoryDirectory(file_id, name, parent_id)
718
            elif kind == 'file':
719
                ie = InventoryFile(file_id, name, parent_id)
1185.82.66 by Aaron Bentley
Handle new executable files
720
                ie.executable = self.is_executable(file_id)
0.5.116 by John Arbash Meinel
Fixed a bug based on the new InventoryEntry separation.
721
            elif kind == 'symlink':
722
                ie = InventoryLink(file_id, name, parent_id)
1185.82.87 by Aaron Bentley
Got symlink adding working
723
                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.
724
            ie.revision = revision_id
725
1185.82.88 by Aaron Bentley
Get symlink modification, renames and deletion under test
726
            if kind in ('directory', 'symlink'):
0.5.83 by John Arbash Meinel
Tests pass. Now ChangesetTree has it's own inventory.
727
                ie.text_size, ie.text_sha1 = None, None
728
            else:
729
                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
730
            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
731
                raise BzrError('Got a text_size of None for file_id %r' % file_id)
732
            inv.add(ie)
733
0.6.1 by Aaron Bentley
Fleshed out MockTree, fixed all test failures
734
        sorted_entries = self.sorted_path_id()
735
        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
736
            add_entry(file_id)
737
738
        return inv
739
740
    # Have to overload the inherited inventory property
741
    # because _get_inventory is only called in the parent.
742
    # Reading the docs, property() objects do not use
743
    # overloading, they use the function as it was defined
744
    # at that instant
745
    inventory = property(_get_inventory)
0.5.64 by John Arbash Meinel
SUCCESS, we now are able to validate the inventory XML.
746
0.5.49 by aaron.bentley at utoronto
Implemented iteration over ids
747
    def __iter__(self):
0.5.82 by John Arbash Meinel
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
748
        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.
749
            yield entry.file_id
0.5.49 by aaron.bentley at utoronto
Implemented iteration over ids
750
0.6.1 by Aaron Bentley
Fleshed out MockTree, fixed all test failures
751
    def sorted_path_id(self):
752
        paths = []
753
        for result in self._new_id.iteritems():
754
            paths.append(result)
755
        for id in self.base_tree:
756
            path = self.id2path(id)
757
            if path is None:
758
                continue
759
            paths.append((path, id))
760
        paths.sort()
761
        return paths
762
1185.82.123 by Aaron Bentley
Cleanups to prepare for review
763
0.5.41 by aaron.bentley at utoronto
Added non-working ChangesetTree
764
def patched_file(file_patch, original):
0.5.94 by Aaron Bentley
Switched to native patch application, added tests for terminating newlines
765
    """Produce a file-like object with the patched version of a text"""
1185.82.13 by Aaron Bentley
Got old changeset tests running
766
    from bzrlib.patches import iter_patched
767
    from bzrlib.iterablefile import IterableFile
0.5.94 by Aaron Bentley
Switched to native patch application, added tests for terminating newlines
768
    if file_patch == "":
769
        return IterableFile(())
1848.1.1 by John Arbash Meinel
fix bug in bundle handling of binary files with just '\r' in them.
770
    # string.splitlines(True) also splits on '\r', but the iter_patched code
771
    # only expects to iterate over '\n' style lines
772
    return IterableFile(iter_patched(original,
773
                StringIO(file_patch).readlines()))