← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branchbuilder.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-16 19:18:39 UTC
  • mto: This revision was merged to the branch mainline in revision 6391.
  • Revision ID: jelmer@samba.org-20111216191839-eg681lxqibi1qxu1
Fix remaining tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branchbuilder.py
17
17
"""Utility for create branches with particular contents."""
18
18
 
19
19
from bzrlib import (
20
 
    bzrdir,
 
20
    controldir,
21
21
    commit,
22
22
    errors,
23
23
    memorytree,
 
24
    revision,
24
25
    )
25
26
 
26
27
 
63
64
            If the path of the transport does not exist but its parent does
64
65
            it will be created.
65
66
        :param format: Either a BzrDirFormat, or the name of a format in the
66
 
            bzrdir format registry for the branch to be built.
 
67
            controldir format registry for the branch to be built.
67
68
        :param branch: An already constructed branch to use.  This param is
68
69
            mutually exclusive with the transport and format params.
69
70
        """
81
82
            if format is None:
82
83
                format = 'default'
83
84
            if isinstance(format, str):
84
 
                format = bzrdir.format_registry.make_bzrdir(format)
85
 
            self._branch = bzrdir.BzrDir.create_branch_convenience(
 
85
                format = controldir.format_registry.make_bzrdir(format)
 
86
            self._branch = controldir.ControlDir.create_branch_convenience(
86
87
                transport.base, format=format, force_new_tree=False)
87
88
        self._tree = None
88
89
 
89
 
    def build_commit(self, **commit_kwargs):
 
90
    def build_commit(self, parent_ids=None, allow_leftmost_as_ghost=False,
 
91
                     **commit_kwargs):
90
92
        """Build a commit on the branch.
91
93
 
92
94
        This makes a commit with no real file content for when you only want
95
97
        :param commit_kwargs: Arguments to pass through to commit, such as
96
98
             timestamp.
97
99
        """
 
100
        if parent_ids is not None:
 
101
            if len(parent_ids) == 0:
 
102
                base_id = revision.NULL_REVISION
 
103
            else:
 
104
                base_id = parent_ids[0]
 
105
            if base_id != self._branch.last_revision():
 
106
                self._move_branch_pointer(base_id,
 
107
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
98
108
        tree = memorytree.MemoryTree.create_on_branch(self._branch)
99
109
        tree.lock_write()
100
110
        try:
 
111
            if parent_ids is not None:
 
112
                tree.set_parent_ids(parent_ids,
 
113
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
101
114
            tree.add('')
102
115
            return self._do_commit(tree, **commit_kwargs)
103
116
        finally:
165
178
        committer=None, timezone=None, message_callback=None):
166
179
        """Build a commit, shaped in a specific way.
167
180
 
 
181
        Most of the actions are self-explanatory.  'flush' is special action to
 
182
        break a series of actions into discrete steps so that complex changes
 
183
        (such as unversioning a file-id and re-adding it with a different kind)
 
184
        can be expressed in a way that will clearly work.
 
185
 
168
186
        :param revision_id: The handle for the new commit, can be None
169
187
        :param parent_ids: A list of parent_ids to use for the commit.
170
188
            It can be None, which indicates to use the last commit.
173
191
            ('modify', ('file-id', 'new-content'))
174
192
            ('unversion', 'file-id')
175
193
            ('rename', ('orig-path', 'new-path'))
 
194
            ('flush', None)
176
195
        :param message: An optional commit message, if not supplied, a default
177
196
            commit message will be written.
178
197
        :param message_callback: A message callback to use for the commit, as
186
205
        :return: The revision_id of the new commit
187
206
        """
188
207
        if parent_ids is not None:
189
 
            base_id = parent_ids[0]
 
208
            if len(parent_ids) == 0:
 
209
                base_id = revision.NULL_REVISION
 
210
            else:
 
211
                base_id = parent_ids[0]
190
212
            if base_id != self._branch.last_revision():
191
213
                self._move_branch_pointer(base_id,
192
214
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
204
226
            # inventory entry. And the only public function to create a
205
227
            # directory is MemoryTree.mkdir() which creates the directory, but
206
228
            # also always adds it. So we have to use a multi-pass setup.
207
 
            to_add_directories = []
208
 
            to_add_files = []
209
 
            to_add_file_ids = []
210
 
            to_add_kinds = []
211
 
            new_contents = {}
212
 
            to_unversion_ids = []
213
 
            to_rename = []
 
229
            pending = _PendingActions()
214
230
            for action, info in actions:
215
231
                if action == 'add':
216
232
                    path, file_id, kind, content = info
217
233
                    if kind == 'directory':
218
 
                        to_add_directories.append((path, file_id))
 
234
                        pending.to_add_directories.append((path, file_id))
219
235
                    else:
220
 
                        to_add_files.append(path)
221
 
                        to_add_file_ids.append(file_id)
222
 
                        to_add_kinds.append(kind)
 
236
                        pending.to_add_files.append(path)
 
237
                        pending.to_add_file_ids.append(file_id)
 
238
                        pending.to_add_kinds.append(kind)
223
239
                        if content is not None:
224
 
                            new_contents[file_id] = content
 
240
                            pending.new_contents[file_id] = content
225
241
                elif action == 'modify':
226
242
                    file_id, content = info
227
 
                    new_contents[file_id] = content
 
243
                    pending.new_contents[file_id] = content
228
244
                elif action == 'unversion':
229
 
                    to_unversion_ids.append(info)
 
245
                    pending.to_unversion_ids.add(info)
230
246
                elif action == 'rename':
231
247
                    from_relpath, to_relpath = info
232
 
                    to_rename.append((from_relpath, to_relpath))
 
248
                    pending.to_rename.append((from_relpath, to_relpath))
 
249
                elif action == 'flush':
 
250
                    self._flush_pending(tree, pending)
 
251
                    pending = _PendingActions()
233
252
                else:
234
253
                    raise ValueError('Unknown build action: "%s"' % (action,))
235
 
            if to_unversion_ids:
236
 
                tree.unversion(to_unversion_ids)
237
 
            for path, file_id in to_add_directories:
238
 
                if path == '':
239
 
                    # Special case, because the path already exists
240
 
                    tree.add([path], [file_id], ['directory'])
241
 
                else:
242
 
                    tree.mkdir(path, file_id)
243
 
            for from_relpath, to_relpath in to_rename:
244
 
                tree.rename_one(from_relpath, to_relpath)
245
 
            tree.add(to_add_files, to_add_file_ids, to_add_kinds)
246
 
            for file_id, content in new_contents.iteritems():
247
 
                tree.put_file_bytes_non_atomic(file_id, content)
 
254
            self._flush_pending(tree, pending)
248
255
            return self._do_commit(tree, message=message, rev_id=revision_id,
249
256
                timestamp=timestamp, timezone=timezone, committer=committer,
250
257
                message_callback=message_callback)
251
258
        finally:
252
259
            tree.unlock()
253
260
 
 
261
    def _flush_pending(self, tree, pending):
 
262
        """Flush the pending actions in 'pending', i.e. apply them to 'tree'."""
 
263
        for path, file_id in pending.to_add_directories:
 
264
            if path == '':
 
265
                old_id = tree.path2id(path)
 
266
                if old_id is not None and old_id in pending.to_unversion_ids:
 
267
                    # We're overwriting this path, no need to unversion
 
268
                    pending.to_unversion_ids.discard(old_id)
 
269
                # Special case, because the path already exists
 
270
                tree.add([path], [file_id], ['directory'])
 
271
            else:
 
272
                tree.mkdir(path, file_id)
 
273
        for from_relpath, to_relpath in pending.to_rename:
 
274
            tree.rename_one(from_relpath, to_relpath)
 
275
        if pending.to_unversion_ids:
 
276
            tree.unversion(pending.to_unversion_ids)
 
277
        tree.add(pending.to_add_files, pending.to_add_file_ids, pending.to_add_kinds)
 
278
        for file_id, content in pending.new_contents.iteritems():
 
279
            tree.put_file_bytes_non_atomic(file_id, content)
 
280
 
254
281
    def get_branch(self):
255
282
        """Return the branch created by the builder."""
256
283
        return self._branch
 
284
 
 
285
 
 
286
class _PendingActions(object):
 
287
    """Pending actions for build_snapshot to take.
 
288
 
 
289
    This is just a simple class to hold a bunch of the intermediate state of
 
290
    build_snapshot in single object.
 
291
    """
 
292
 
 
293
    def __init__(self):
 
294
        self.to_add_directories = []
 
295
        self.to_add_files = []
 
296
        self.to_add_file_ids = []
 
297
        self.to_add_kinds = []
 
298
        self.new_contents = {}
 
299
        self.to_unversion_ids = set()
 
300
        self.to_rename = []
 
301