/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/branchbuilder.py

  • Committer: Jelmer Vernooij
  • Date: 2018-05-20 23:20:37 UTC
  • mto: (6973.5.1 python3-c)
  • mto: This revision was merged to the branch mainline in revision 6984.
  • Revision ID: jelmer@jelmer.uk-20180520232037-inu6kdob1k6gwsyd
Fix a bunch of tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/branchbuilder.py
16
16
 
17
17
"""Utility for create branches with particular contents."""
18
18
 
19
 
from bzrlib import (
20
 
    bzrdir,
 
19
from __future__ import absolute_import
 
20
 
 
21
from . import (
 
22
    controldir,
21
23
    commit,
22
24
    errors,
23
25
    memorytree,
 
26
    revision,
 
27
    )
 
28
from .sixish import (
 
29
    viewitems,
24
30
    )
25
31
 
26
32
 
36
42
 
37
43
    For instance:
38
44
 
39
 
    >>> from bzrlib.transport.memory import MemoryTransport
 
45
    >>> from breezy.transport.memory import MemoryTransport
40
46
    >>> builder = BranchBuilder(MemoryTransport("memory:///"))
41
47
    >>> builder.start_series()
42
 
    >>> builder.build_snapshot('rev-id', None, [
43
 
    ...     ('add', ('', 'root-id', 'directory', '')),
44
 
    ...     ('add', ('filename', 'f-id', 'file', 'content\n'))])
 
48
    >>> builder.build_snapshot(None, [
 
49
    ...     ('add', ('', b'root-id', 'directory', '')),
 
50
    ...     ('add', ('filename', b'f-id', 'file', 'content\n'))],
 
51
    ...     revision_id=b'rev-id')
45
52
    'rev-id'
46
 
    >>> builder.build_snapshot('rev2-id', ['rev-id'],
47
 
    ...     [('modify', ('f-id', 'new-content\n'))])
 
53
    >>> builder.build_snapshot(['rev-id'],
 
54
    ...     [('modify', (b'f-id', 'new-content\n'))],
 
55
    ...     revision_id=b'rev2-id')
48
56
    'rev2-id'
49
57
    >>> builder.finish_series()
50
58
    >>> branch = builder.get_branch()
63
71
            If the path of the transport does not exist but its parent does
64
72
            it will be created.
65
73
        :param format: Either a BzrDirFormat, or the name of a format in the
66
 
            bzrdir format registry for the branch to be built.
 
74
            controldir format registry for the branch to be built.
67
75
        :param branch: An already constructed branch to use.  This param is
68
76
            mutually exclusive with the transport and format params.
69
77
        """
81
89
            if format is None:
82
90
                format = 'default'
83
91
            if isinstance(format, str):
84
 
                format = bzrdir.format_registry.make_bzrdir(format)
85
 
            self._branch = bzrdir.BzrDir.create_branch_convenience(
 
92
                format = controldir.format_registry.make_controldir(format)
 
93
            self._branch = controldir.ControlDir.create_branch_convenience(
86
94
                transport.base, format=format, force_new_tree=False)
87
95
        self._tree = None
88
96
 
89
 
    def build_commit(self, **commit_kwargs):
 
97
    def build_commit(self, parent_ids=None, allow_leftmost_as_ghost=False,
 
98
                     **commit_kwargs):
90
99
        """Build a commit on the branch.
91
100
 
92
101
        This makes a commit with no real file content for when you only want
95
104
        :param commit_kwargs: Arguments to pass through to commit, such as
96
105
             timestamp.
97
106
        """
98
 
        tree = memorytree.MemoryTree.create_on_branch(self._branch)
 
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)
 
115
        tree = self._branch.create_memorytree()
99
116
        tree.lock_write()
100
117
        try:
 
118
            if parent_ids is not None:
 
119
                tree.set_parent_ids(parent_ids,
 
120
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
101
121
            tree.add('')
102
122
            return self._do_commit(tree, **commit_kwargs)
103
123
        finally:
137
157
            # We are cheating a little bit here, and locking the new tree
138
158
            # before the old tree is unlocked. But that way the branch stays
139
159
            # locked throughout.
140
 
            new_tree = memorytree.MemoryTree.create_on_branch(self._branch)
 
160
            new_tree = self._branch.create_memorytree()
141
161
            new_tree.lock_write()
142
162
            self._tree.unlock()
143
163
            self._tree = new_tree
152
172
        if self._tree is not None:
153
173
            raise AssertionError('You cannot start a new series while a'
154
174
                                 ' series is already going.')
155
 
        self._tree = memorytree.MemoryTree.create_on_branch(self._branch)
 
175
        self._tree = self._branch.create_memorytree()
156
176
        self._tree.lock_write()
157
177
 
158
178
    def finish_series(self):
160
180
        self._tree.unlock()
161
181
        self._tree = None
162
182
 
163
 
    def build_snapshot(self, revision_id, parent_ids, actions,
164
 
        message=None, timestamp=None, allow_leftmost_as_ghost=False,
165
 
        committer=None, timezone=None, message_callback=None):
 
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):
166
186
        """Build a commit, shaped in a specific way.
167
187
 
168
 
        :param revision_id: The handle for the new commit, can be None
 
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
 
169
193
        :param parent_ids: A list of parent_ids to use for the commit.
170
194
            It can be None, which indicates to use the last commit.
171
195
        :param actions: A list of actions to perform. Supported actions are:
172
196
            ('add', ('path', 'file-id', 'kind', 'content' or None))
173
 
            ('modify', ('file-id', 'new-content'))
174
 
            ('unversion', 'file-id')
 
197
            ('modify', ('path', 'new-content'))
 
198
            ('unversion', 'path')
175
199
            ('rename', ('orig-path', 'new-path'))
 
200
            ('flush', None)
176
201
        :param message: An optional commit message, if not supplied, a default
177
202
            commit message will be written.
178
203
        :param message_callback: A message callback to use for the commit, as
183
208
        :param committer: An optional username to use for commit
184
209
        :param allow_leftmost_as_ghost: True if the leftmost parent should be
185
210
            permitted to be a ghost.
 
211
        :param revision_id: The handle for the new commit, can be None
186
212
        :return: The revision_id of the new commit
187
213
        """
188
214
        if parent_ids is not None:
189
 
            base_id = parent_ids[0]
 
215
            if len(parent_ids) == 0:
 
216
                base_id = revision.NULL_REVISION
 
217
            else:
 
218
                base_id = parent_ids[0]
190
219
            if base_id != self._branch.last_revision():
191
220
                self._move_branch_pointer(base_id,
192
221
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
194
223
        if self._tree is not None:
195
224
            tree = self._tree
196
225
        else:
197
 
            tree = memorytree.MemoryTree.create_on_branch(self._branch)
198
 
        tree.lock_write()
199
 
        try:
 
226
            tree = self._branch.create_memorytree()
 
227
        with tree.lock_write():
200
228
            if parent_ids is not None:
201
229
                tree.set_parent_ids(parent_ids,
202
230
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
204
232
            # inventory entry. And the only public function to create a
205
233
            # directory is MemoryTree.mkdir() which creates the directory, but
206
234
            # 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 = []
 
235
            pending = _PendingActions()
214
236
            for action, info in actions:
215
237
                if action == 'add':
216
238
                    path, file_id, kind, content = info
217
239
                    if kind == 'directory':
218
 
                        to_add_directories.append((path, file_id))
 
240
                        pending.to_add_directories.append((path, file_id))
219
241
                    else:
220
 
                        to_add_files.append(path)
221
 
                        to_add_file_ids.append(file_id)
222
 
                        to_add_kinds.append(kind)
 
242
                        pending.to_add_files.append(path)
 
243
                        pending.to_add_file_ids.append(file_id)
 
244
                        pending.to_add_kinds.append(kind)
223
245
                        if content is not None:
224
 
                            new_contents[file_id] = content
 
246
                            pending.new_contents[path] = content
225
247
                elif action == 'modify':
226
 
                    file_id, content = info
227
 
                    new_contents[file_id] = content
 
248
                    path, content = info
 
249
                    pending.new_contents[path] = content
228
250
                elif action == 'unversion':
229
 
                    to_unversion_ids.append(info)
 
251
                    pending.to_unversion_paths.add(info)
230
252
                elif action == 'rename':
231
253
                    from_relpath, to_relpath = info
232
 
                    to_rename.append((from_relpath, to_relpath))
 
254
                    pending.to_rename.append((from_relpath, to_relpath))
 
255
                elif action == 'flush':
 
256
                    self._flush_pending(tree, pending)
 
257
                    pending = _PendingActions()
233
258
                else:
234
259
                    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)
 
260
            self._flush_pending(tree, pending)
248
261
            return self._do_commit(tree, message=message, rev_id=revision_id,
249
262
                timestamp=timestamp, timezone=timezone, committer=committer,
250
263
                message_callback=message_callback)
251
 
        finally:
252
 
            tree.unlock()
 
264
 
 
265
    def _flush_pending(self, tree, pending):
 
266
        """Flush the pending actions in 'pending', i.e. apply them to 'tree'."""
 
267
        for path, file_id in pending.to_add_directories:
 
268
            if path == '':
 
269
                if tree.has_filename(path) and path in pending.to_unversion_paths:
 
270
                    # We're overwriting this path, no need to unversion
 
271
                    pending.to_unversion_paths.discard(path)
 
272
                # Special case, because the path already exists
 
273
                tree.add([path], [file_id], ['directory'])
 
274
            else:
 
275
                tree.mkdir(path, file_id)
 
276
        for from_relpath, to_relpath in pending.to_rename:
 
277
            tree.rename_one(from_relpath, to_relpath)
 
278
        if pending.to_unversion_paths:
 
279
            tree.unversion(pending.to_unversion_paths)
 
280
        tree.add(pending.to_add_files, pending.to_add_file_ids, pending.to_add_kinds)
 
281
        for path, content in viewitems(pending.new_contents):
 
282
            tree.put_file_bytes_non_atomic(path, content)
253
283
 
254
284
    def get_branch(self):
255
285
        """Return the branch created by the builder."""
256
286
        return self._branch
 
287
 
 
288
 
 
289
class _PendingActions(object):
 
290
    """Pending actions for build_snapshot to take.
 
291
 
 
292
    This is just a simple class to hold a bunch of the intermediate state of
 
293
    build_snapshot in single object.
 
294
    """
 
295
 
 
296
    def __init__(self):
 
297
        self.to_add_directories = []
 
298
        self.to_add_files = []
 
299
        self.to_add_file_ids = []
 
300
        self.to_add_kinds = []
 
301
        self.new_contents = {}
 
302
        self.to_unversion_paths = set()
 
303
        self.to_rename = []
 
304