/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4070.5.1 by Martin Pool
BranchBuilder now takes a timestamp for commits
1
# Copyright (C) 2007, 2008, 2009 Canonical Ltd
2466.7.3 by Robert Collins
Create bzrlib.branchbuilder.
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2466.7.3 by Robert Collins
Create bzrlib.branchbuilder.
16
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
17
"""Utility for create branches with particular contents."""
18
6379.6.1 by Jelmer Vernooij
Import absolute_import in a few places.
19
from __future__ import absolute_import
20
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
21
from . import (
6207.3.3 by jelmer at samba
Fix tests and the like.
22
    controldir,
3825.3.2 by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor
23
    commit,
24
    errors,
25
    memorytree,
5540.1.1 by Gary van der Merwe
Make ``BranchBuilder.build_snapshot`` accept parent_ids == ['null:'].
26
    revision,
3825.3.2 by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor
27
    )
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
28
from .sixish import (
29
    viewitems,
30
    )
2466.7.3 by Robert Collins
Create bzrlib.branchbuilder.
31
32
33
class BranchBuilder(object):
3825.3.2 by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor
34
    r"""A BranchBuilder aids creating Branches with particular shapes.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
35
2466.7.7 by Robert Collins
Document basic usage.
36
    The expected way to use BranchBuilder is to construct a
37
    BranchBuilder on the transport you want your branch on, and then call
38
    appropriate build_ methods on it to get the shape of history you want.
39
3567.4.18 by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved.
40
    This is meant as a helper for the test suite, not as a general class for
41
    real data.
42
2466.7.7 by Robert Collins
Document basic usage.
43
    For instance:
3825.3.2 by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor
44
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
45
    >>> from breezy.transport.memory import MemoryTransport
3825.3.2 by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor
46
    >>> builder = BranchBuilder(MemoryTransport("memory:///"))
47
    >>> builder.start_series()
6816.2.1 by Jelmer Vernooij
Migrate some build_snapshot code over to having revision_id as keyword argument.
48
    >>> builder.build_snapshot(None, [
3825.3.2 by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor
49
    ...     ('add', ('', 'root-id', 'directory', '')),
6816.2.1 by Jelmer Vernooij
Migrate some build_snapshot code over to having revision_id as keyword argument.
50
    ...     ('add', ('filename', 'f-id', 'file', 'content\n'))],
51
    ...     revision_id='rev-id')
3825.3.2 by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor
52
    'rev-id'
6816.2.1 by Jelmer Vernooij
Migrate some build_snapshot code over to having revision_id as keyword argument.
53
    >>> builder.build_snapshot(['rev-id'],
54
    ...     [('modify', ('f-id', 'new-content\n'))],
55
    ...     revision_id='rev2-id')
3825.3.2 by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor
56
    'rev2-id'
57
    >>> builder.finish_series()
58
    >>> branch = builder.get_branch()
3567.4.18 by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved.
59
60
    :ivar _tree: This is a private member which is not meant to be modified by
61
        users of this class. While a 'series' is in progress, it should hold a
62
        MemoryTree with the contents of the last commit (ready to be modified
63
        by the next build_snapshot command) with a held write lock. Outside of
64
        a series in progress, it should be None.
2466.7.7 by Robert Collins
Document basic usage.
65
    """
2466.7.3 by Robert Collins
Create bzrlib.branchbuilder.
66
4476.3.59 by Andrew Bennetts
Undo changes that aren't needed anymore.
67
    def __init__(self, transport=None, format=None, branch=None):
2466.7.5 by Robert Collins
Better docstring for BranchBuilder.__init__.
68
        """Construct a BranchBuilder on transport.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
69
2466.7.5 by Robert Collins
Better docstring for BranchBuilder.__init__.
70
        :param transport: The transport the branch should be created on.
71
            If the path of the transport does not exist but its parent does
72
            it will be created.
3567.4.18 by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved.
73
        :param format: Either a BzrDirFormat, or the name of a format in the
6207.3.3 by jelmer at samba
Fix tests and the like.
74
            controldir format registry for the branch to be built.
4257.3.8 by Andrew Bennetts
Fix TestCase.make_branch_builder to make a branch in the specified format. Also add an interrepo test scenario for KnitPack1 -> KnitPack6RichRoot, which fails.
75
        :param branch: An already constructed branch to use.  This param is
76
            mutually exclusive with the transport and format params.
2466.7.5 by Robert Collins
Better docstring for BranchBuilder.__init__.
77
        """
4257.3.8 by Andrew Bennetts
Fix TestCase.make_branch_builder to make a branch in the specified format. Also add an interrepo test scenario for KnitPack1 -> KnitPack6RichRoot, which fails.
78
        if branch is not None:
79
            if format is not None:
80
                raise AssertionError(
81
                    "branch and format kwargs are mutually exclusive")
82
            if transport is not None:
83
                raise AssertionError(
84
                    "branch and transport kwargs are mutually exclusive")
85
            self._branch = branch
86
        else:
87
            if not transport.has('.'):
88
                transport.mkdir('.')
89
            if format is None:
90
                format = 'default'
91
            if isinstance(format, str):
6653.6.5 by Jelmer Vernooij
Rename make_bzrdir to make_controldir.
92
                format = controldir.format_registry.make_controldir(format)
6207.3.3 by jelmer at samba
Fix tests and the like.
93
            self._branch = controldir.ControlDir.create_branch_convenience(
4257.3.8 by Andrew Bennetts
Fix TestCase.make_branch_builder to make a branch in the specified format. Also add an interrepo test scenario for KnitPack1 -> KnitPack6RichRoot, which fails.
94
                transport.base, format=format, force_new_tree=False)
3567.4.17 by John Arbash Meinel
Add the ability to define a series of commits, which allows us to hold open the locks.
95
        self._tree = None
2466.7.4 by Robert Collins
Add BranchBuilder.get_branch().
96
6225.1.1 by Jelmer Vernooij
Add parent_ids argument to BranchBuilder.build_commit.
97
    def build_commit(self, parent_ids=None, allow_leftmost_as_ghost=False,
98
                     **commit_kwargs):
4070.5.1 by Martin Pool
BranchBuilder now takes a timestamp for commits
99
        """Build a commit on the branch.
4070.4.12 by Martin Pool
Kill trailing whitespace
100
4070.5.1 by Martin Pool
BranchBuilder now takes a timestamp for commits
101
        This makes a commit with no real file content for when you only want
102
        to look at the revision graph structure.
103
104
        :param commit_kwargs: Arguments to pass through to commit, such as
105
             timestamp.
106
        """
6225.1.1 by Jelmer Vernooij
Add parent_ids argument to BranchBuilder.build_commit.
107
        if parent_ids is not None:
108
            if len(parent_ids) == 0:
109
                base_id = revision.NULL_REVISION
110
            else:
111
                base_id = parent_ids[0]
112
            if base_id != self._branch.last_revision():
113
                self._move_branch_pointer(base_id,
114
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
6883.8.1 by Jelmer Vernooij
Add Branch.create_memorytree.
115
        tree = self._branch.create_memorytree()
2466.7.6 by Robert Collins
Add BranchBuilder.build_commit.
116
        tree.lock_write()
2466.7.9 by Robert Collins
Return the commited revision id from BranchBuilder.build_commit to save later instrospection.
117
        try:
6225.1.1 by Jelmer Vernooij
Add parent_ids argument to BranchBuilder.build_commit.
118
            if parent_ids is not None:
119
                tree.set_parent_ids(parent_ids,
120
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
2466.7.9 by Robert Collins
Return the commited revision id from BranchBuilder.build_commit to save later instrospection.
121
            tree.add('')
4070.5.1 by Martin Pool
BranchBuilder now takes a timestamp for commits
122
            return self._do_commit(tree, **commit_kwargs)
2466.7.9 by Robert Collins
Return the commited revision id from BranchBuilder.build_commit to save later instrospection.
123
        finally:
124
            tree.unlock()
2466.7.6 by Robert Collins
Add BranchBuilder.build_commit.
125
5060.1.1 by Robert Collins
``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
126
    def _do_commit(self, tree, message=None, message_callback=None, **kwargs):
3825.3.2 by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor
127
        reporter = commit.NullCommitReporter()
5060.1.1 by Robert Collins
``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
128
        if message is None and message_callback is None:
3825.3.2 by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor
129
            message = u'commit %d' % (self._branch.revno() + 1,)
5060.1.1 by Robert Collins
``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
130
        return tree.commit(message, message_callback=message_callback,
3825.3.2 by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor
131
            reporter=reporter,
132
            **kwargs)
133
4324.3.1 by Robert Collins
When adding rich root data follow the standard revision graph rules, so it does not create 'inconstent parents'.
134
    def _move_branch_pointer(self, new_revision_id,
135
        allow_leftmost_as_ghost=False):
3567.4.10 by John Arbash Meinel
Clean up the build_snapshot api a bit.
136
        """Point self._branch to a different revision id."""
137
        self._branch.lock_write()
138
        try:
139
            # We don't seem to have a simple set_last_revision(), so we
140
            # implement it here.
141
            cur_revno, cur_revision_id = self._branch.last_revision_info()
4324.3.1 by Robert Collins
When adding rich root data follow the standard revision graph rules, so it does not create 'inconstent parents'.
142
            try:
143
                g = self._branch.repository.get_graph()
144
                new_revno = g.find_distance_to_null(new_revision_id,
145
                    [(cur_revision_id, cur_revno)])
146
                self._branch.set_last_revision_info(new_revno, new_revision_id)
147
            except errors.GhostRevisionsHaveNoRevno:
148
                if not allow_leftmost_as_ghost:
149
                    raise
150
                new_revno = 1
3567.4.10 by John Arbash Meinel
Clean up the build_snapshot api a bit.
151
        finally:
152
            self._branch.unlock()
3567.4.17 by John Arbash Meinel
Add the ability to define a series of commits, which allows us to hold open the locks.
153
        if self._tree is not None:
154
            # We are currently processing a series, but when switching branch
155
            # pointers, it is easiest to just create a new memory tree.
156
            # That way we are sure to have the right files-on-disk
157
            # We are cheating a little bit here, and locking the new tree
158
            # before the old tree is unlocked. But that way the branch stays
159
            # locked throughout.
6883.8.1 by Jelmer Vernooij
Add Branch.create_memorytree.
160
            new_tree = self._branch.create_memorytree()
3567.4.17 by John Arbash Meinel
Add the ability to define a series of commits, which allows us to hold open the locks.
161
            new_tree.lock_write()
162
            self._tree.unlock()
163
            self._tree = new_tree
164
165
    def start_series(self):
166
        """We will be creating a series of commits.
167
168
        This allows us to hold open the locks while we are processing.
169
170
        Make sure to call 'finish_series' when you are done.
171
        """
3567.4.18 by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved.
172
        if self._tree is not None:
173
            raise AssertionError('You cannot start a new series while a'
174
                                 ' series is already going.')
6883.8.1 by Jelmer Vernooij
Add Branch.create_memorytree.
175
        self._tree = self._branch.create_memorytree()
3567.4.17 by John Arbash Meinel
Add the ability to define a series of commits, which allows us to hold open the locks.
176
        self._tree.lock_write()
177
178
    def finish_series(self):
179
        """Call this after start_series to unlock the various objects."""
180
        self._tree.unlock()
181
        self._tree = None
3567.4.10 by John Arbash Meinel
Clean up the build_snapshot api a bit.
182
6816.2.1 by Jelmer Vernooij
Migrate some build_snapshot code over to having revision_id as keyword argument.
183
    def build_snapshot(self, parent_ids, actions, message=None, timestamp=None,
184
            allow_leftmost_as_ghost=False, committer=None, timezone=None,
185
            message_callback=None, revision_id=None):
3567.4.10 by John Arbash Meinel
Clean up the build_snapshot api a bit.
186
        """Build a commit, shaped in a specific way.
187
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
188
        Most of the actions are self-explanatory.  'flush' is special action to
189
        break a series of actions into discrete steps so that complex changes
190
        (such as unversioning a file-id and re-adding it with a different kind)
191
        can be expressed in a way that will clearly work.
192
3567.4.10 by John Arbash Meinel
Clean up the build_snapshot api a bit.
193
        :param parent_ids: A list of parent_ids to use for the commit.
194
            It can be None, which indicates to use the last commit.
195
        :param actions: A list of actions to perform. Supported actions are:
196
            ('add', ('path', 'file-id', 'kind', 'content' or None))
197
            ('modify', ('file-id', 'new-content'))
198
            ('unversion', 'file-id')
3567.5.2 by John Arbash Meinel
'rename' is a supported action.
199
            ('rename', ('orig-path', 'new-path'))
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
200
            ('flush', None)
3567.4.15 by John Arbash Meinel
Allow setting the commit message.
201
        :param message: An optional commit message, if not supplied, a default
202
            commit message will be written.
5060.1.1 by Robert Collins
``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
203
        :param message_callback: A message callback to use for the commit, as
204
            per mutabletree.commit.
4070.4.12 by Martin Pool
Kill trailing whitespace
205
        :param timestamp: If non-None, set the timestamp of the commit to this
4070.5.1 by Martin Pool
BranchBuilder now takes a timestamp for commits
206
            value.
4523.2.1 by Vincent Ladeuil
Fix TZ-dependent tests.
207
        :param timezone: An optional timezone for timestamp.
4454.3.24 by John Arbash Meinel
update BranchBuilder to support 'committer'
208
        :param committer: An optional username to use for commit
4324.3.1 by Robert Collins
When adding rich root data follow the standard revision graph rules, so it does not create 'inconstent parents'.
209
        :param allow_leftmost_as_ghost: True if the leftmost parent should be
210
            permitted to be a ghost.
6816.2.1 by Jelmer Vernooij
Migrate some build_snapshot code over to having revision_id as keyword argument.
211
        :param revision_id: The handle for the new commit, can be None
3567.4.18 by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved.
212
        :return: The revision_id of the new commit
3567.4.10 by John Arbash Meinel
Clean up the build_snapshot api a bit.
213
        """
3567.4.8 by John Arbash Meinel
Add the ability to force a basis for a revision.
214
        if parent_ids is not None:
5540.2.1 by Gary van der Merwe
Allow for BranchBuilder.build_snapshot to accept parent_ids = [], rather than ['null:'].
215
            if len(parent_ids) == 0:
216
                base_id = revision.NULL_REVISION
217
            else:
218
                base_id = parent_ids[0]
3567.4.10 by John Arbash Meinel
Clean up the build_snapshot api a bit.
219
            if base_id != self._branch.last_revision():
4324.3.1 by Robert Collins
When adding rich root data follow the standard revision graph rules, so it does not create 'inconstent parents'.
220
                self._move_branch_pointer(base_id,
221
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
3567.4.10 by John Arbash Meinel
Clean up the build_snapshot api a bit.
222
3567.4.17 by John Arbash Meinel
Add the ability to define a series of commits, which allows us to hold open the locks.
223
        if self._tree is not None:
224
            tree = self._tree
225
        else:
6883.8.1 by Jelmer Vernooij
Add Branch.create_memorytree.
226
            tree = self._branch.create_memorytree()
3567.4.1 by John Arbash Meinel
Initial work to have BranchBuilder allow us to do tree-shape work.
227
        tree.lock_write()
228
        try:
5540.2.1 by Gary van der Merwe
Allow for BranchBuilder.build_snapshot to accept parent_ids = [], rather than ['null:'].
229
            if parent_ids is not None:
4324.3.1 by Robert Collins
When adding rich root data follow the standard revision graph rules, so it does not create 'inconstent parents'.
230
                tree.set_parent_ids(parent_ids,
231
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
3567.4.7 by John Arbash Meinel
Revert back to using MemoryTree.mkdir() rather than creating the directory during add().
232
            # Unfortunately, MemoryTree.add(directory) just creates an
233
            # inventory entry. And the only public function to create a
234
            # directory is MemoryTree.mkdir() which creates the directory, but
235
            # also always adds it. So we have to use a multi-pass setup.
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
236
            pending = _PendingActions()
3567.4.1 by John Arbash Meinel
Initial work to have BranchBuilder allow us to do tree-shape work.
237
            for action, info in actions:
238
                if action == 'add':
239
                    path, file_id, kind, content = info
3567.4.7 by John Arbash Meinel
Revert back to using MemoryTree.mkdir() rather than creating the directory during add().
240
                    if kind == 'directory':
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
241
                        pending.to_add_directories.append((path, file_id))
3567.4.7 by John Arbash Meinel
Revert back to using MemoryTree.mkdir() rather than creating the directory during add().
242
                    else:
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
243
                        pending.to_add_files.append(path)
244
                        pending.to_add_file_ids.append(file_id)
245
                        pending.to_add_kinds.append(kind)
3567.4.7 by John Arbash Meinel
Revert back to using MemoryTree.mkdir() rather than creating the directory during add().
246
                        if content is not None:
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
247
                            pending.new_contents[file_id] = content
3567.4.3 by John Arbash Meinel
Add an action for modifying an existing file
248
                elif action == 'modify':
249
                    file_id, content = info
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
250
                    pending.new_contents[file_id] = content
3567.4.4 by John Arbash Meinel
Add the ability to 'unversion' files, and handle unknown actions.
251
                elif action == 'unversion':
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
252
                    pending.to_unversion_ids.add(info)
3567.5.1 by John Arbash Meinel
Implement rename_one on MemoryTree, and expose that in the Branch Builder
253
                elif action == 'rename':
254
                    from_relpath, to_relpath = info
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
255
                    pending.to_rename.append((from_relpath, to_relpath))
256
                elif action == 'flush':
257
                    self._flush_pending(tree, pending)
258
                    pending = _PendingActions()
3567.4.4 by John Arbash Meinel
Add the ability to 'unversion' files, and handle unknown actions.
259
                else:
3567.4.18 by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved.
260
                    raise ValueError('Unknown build action: "%s"' % (action,))
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
261
            self._flush_pending(tree, pending)
4070.5.1 by Martin Pool
BranchBuilder now takes a timestamp for commits
262
            return self._do_commit(tree, message=message, rev_id=revision_id,
5060.1.1 by Robert Collins
``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
263
                timestamp=timestamp, timezone=timezone, committer=committer,
264
                message_callback=message_callback)
3567.4.1 by John Arbash Meinel
Initial work to have BranchBuilder allow us to do tree-shape work.
265
        finally:
266
            tree.unlock()
267
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
268
    def _flush_pending(self, tree, pending):
269
        """Flush the pending actions in 'pending', i.e. apply them to 'tree'."""
270
        for path, file_id in pending.to_add_directories:
6008.2.4 by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform.
271
            if path == '':
272
                old_id = tree.path2id(path)
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
273
                if old_id is not None and old_id in pending.to_unversion_ids:
6008.2.4 by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform.
274
                    # We're overwriting this path, no need to unversion
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
275
                    pending.to_unversion_ids.discard(old_id)
6008.2.4 by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform.
276
                # Special case, because the path already exists
277
                tree.add([path], [file_id], ['directory'])
278
            else:
279
                tree.mkdir(path, file_id)
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
280
        for from_relpath, to_relpath in pending.to_rename:
6008.2.4 by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform.
281
            tree.rename_one(from_relpath, to_relpath)
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
282
        if pending.to_unversion_ids:
6809.4.25 by Jelmer Vernooij
Add paths argument to .unversion.
283
            tree.unversion([tree.id2path(fid) for fid in pending.to_unversion_ids])
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
284
        tree.add(pending.to_add_files, pending.to_add_file_ids, pending.to_add_kinds)
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
285
        for file_id, content in viewitems(pending.new_contents):
6809.4.8 by Jelmer Vernooij
Fix some test failures.
286
            tree.put_file_bytes_non_atomic(
287
                    tree.id2path(file_id), content,
288
                    file_id=file_id)
6008.2.4 by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform.
289
2466.7.4 by Robert Collins
Add BranchBuilder.get_branch().
290
    def get_branch(self):
291
        """Return the branch created by the builder."""
292
        return self._branch
6008.2.4 by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform.
293
294
6008.2.5 by Andrew Bennetts
Rename 'checkpoint' to 'flush', add some unit tests and more comments.
295
class _PendingActions(object):
296
    """Pending actions for build_snapshot to take.
297
298
    This is just a simple class to hold a bunch of the intermediate state of
299
    build_snapshot in single object.
300
    """
6008.2.4 by Andrew Bennetts
Add ('checkpoint', None) action to BranchBuilder.build_snapshot to allow complex set of adds/deletes/renames to work without reinventing TreeTransform.
301
302
    def __init__(self):
303
        self.to_add_directories = []
304
        self.to_add_files = []
305
        self.to_add_file_ids = []
306
        self.to_add_kinds = []
307
        self.new_contents = {}
308
        self.to_unversion_ids = set()
309
        self.to_rename = []
310